From 999a2a46d847075b4b8523369c7a41adf428329a Mon Sep 17 00:00:00 2001 From: He Liu Date: Wed, 21 Aug 2024 23:41:11 +0800 Subject: [PATCH] upgrade hc upgrade job to cover payload version and arch upgrade (#55276) --- ...s-private-release-4.16__amd64-nightly.yaml | 13 -- ...ts-private-release-4.16__amd64-stable.yaml | 13 ++ ...-tests-private-release-4.16-periodics.yaml | 186 ++++++++---------- 3 files changed, 100 insertions(+), 112 deletions(-) diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-nightly.yaml index e95dd785951a..89e21af92c0c 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-nightly.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-nightly.yaml @@ -536,19 +536,6 @@ tests: test: - chain: openshift-e2e-test-hypershift-qe workflow: cucushift-installer-rehearse-aws-ipi-ovn-hypershift-guest -- as: aws-ipi-ovn-hypershift-to-multiarch-f7 - cron: 38 8 8,18 * * - steps: - cluster_profile: aws-qe - dependencies: - NODEPOOL_RELEASE_IMAGE_LATEST: release:target - env: - BASE_DOMAIN: qe.devcluster.openshift.com - HYPERSHIFT_ENABLE_MULTIARCH: "true" - TEST_FILTERS: ~DisconnectedOnly&;~HyperShiftMGMT&;~MicroShiftOnly&;~NonHyperShiftHOST& - test: - - chain: openshift-upgrade-qe-test-hypershift-to-multi - workflow: cucushift-installer-rehearse-aws-ipi-ovn-hypershift-guest - as: aws-ipi-ovn-hypershift-fips-guest-f28-destructive cron: 10 8 14 * * steps: diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-stable.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-stable.yaml index 965e6b0fe0f5..301d61f7ea7a 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-stable.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-stable.yaml @@ -118,6 +118,19 @@ tests: test: - chain: cucushift-installer-check-cluster-health workflow: cucushift-installer-rehearse-aws-ipi-disconnected-private-cco-manual-security-token-service-private-s3-with-ep-sts-ec2-elb +- as: aws-ipi-ovn-hypershift-to-multiarch-f7 + cron: 10 6 9,16,23,30 * * + steps: + cluster_profile: aws-qe + dependencies: + NODEPOOL_RELEASE_IMAGE_LATEST: release:target + env: + BASE_DOMAIN: qe.devcluster.openshift.com + HYPERSHIFT_ENABLE_MULTIARCH: "true" + TEST_FILTERS: ~DisconnectedOnly&;~HyperShiftMGMT&;~MicroShiftOnly&;~NonHyperShiftHOST& + test: + - chain: openshift-upgrade-qe-test-hypershift-to-multi + workflow: cucushift-installer-rehearse-aws-ipi-ovn-hypershift-guest - as: aws-ipi-ovn-ipsec-to-multiarch-f28 cron: 40 21 8 * * steps: diff --git a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16-periodics.yaml b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16-periodics.yaml index 5881d1d755da..247d85315c7c 100644 --- a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16-periodics.yaml +++ b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.16-periodics.yaml @@ -13288,105 +13288,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build03 - cron: 38 8 8,18 * * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: release-4.16 - org: openshift - repo: openshift-tests-private - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-qe - ci-operator.openshift.io/variant: amd64-nightly - ci.openshift.io/generator: prowgen - job-release: "4.16" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-nightly-aws-ipi-ovn-hypershift-to-multiarch-f7 - reporter_config: - slack: - channel: '#forum-prow-hypershift-qe-ci' - job_states_to_report: - - failure - - error - - success - report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}} - :volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View - logs> :volcano: {{end}}' - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --oauth-token-path=/usr/local/github-credentials/oauth - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/aws-ipi-ovn-hypershift-to-multiarch-f7-cluster-profile - - --target=aws-ipi-ovn-hypershift-to-multiarch-f7 - - --variant=amd64-nightly - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/aws-ipi-ovn-hypershift-to-multiarch-f7-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /usr/local/github-credentials - name: github-credentials-openshift-ci-robot-private-git-cloner - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-aws-qe - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build03 cron: 33 14 9,27 * * @@ -38445,6 +38346,93 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build03 + cron: 10 6 9,16,23,30 * * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-4.16 + org: openshift + repo: openshift-tests-private + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-qe + ci-operator.openshift.io/variant: amd64-stable + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-stable-aws-ipi-ovn-hypershift-to-multiarch-f7 + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --oauth-token-path=/usr/local/github-credentials/oauth + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/aws-ipi-ovn-hypershift-to-multiarch-f7-cluster-profile + - --target=aws-ipi-ovn-hypershift-to-multiarch-f7 + - --variant=amd64-stable + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/aws-ipi-ovn-hypershift-to-multiarch-f7-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + secret: + secretName: cluster-secrets-aws-qe + - name: github-credentials-openshift-ci-robot-private-git-cloner + secret: + secretName: github-credentials-openshift-ci-robot-private-git-cloner + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build03 cron: 40 21 8 * *