Support oc adm upgrade rollback in CI (#51287)

openshift · May 10, 2024 · f986910 · f986910
1 parent ec286bd
commit f986910
Show file tree

Hide file tree

Showing 10 changed files with 243 additions and 119 deletions.
diff --git a/...hift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-rollback-ec.yaml b/...hift-tests-private/openshift-openshift-tests-private-release-4.16__amd64-rollback-ec.yaml
@@ -62,10 +62,14 @@ build_root:
     tag: golang-1.18
 releases:
   latest:
-    release:
+    prerelease:
       architecture: amd64
-      channel: candidate
-      version: 4.16.0-ec.0
+      product: ocp
+      relative: 1
+      version_bounds:
+        lower: 4.16.0-0
+        stream: 4-dev-preview
+        upper: 4.17.0-0
   target:
     prerelease:
       architecture: amd64
@@ -89,19 +93,7 @@ tests:
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
     test:
-    - as: set-upgrade-releases
-      commands: echo "${RELEASE_IMAGE_TARGET},${RELEASE_IMAGE_LATEST}" > ${SHARED_DIR}/upgrade-edge
-      dependencies:
-      - env: RELEASE_IMAGE_TARGET
-        name: release:target
-      - env: RELEASE_IMAGE_LATEST
-        name: release:latest
-      from: cli
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    - ref: cucushift-chainupgrade-toimage
+    - chain: openshift-upgrade-qe-sanity-rollback
     workflow: cucushift-installer-rehearse-aws-ipi-byo-route53
 zz_generated_metadata:
   branch: release-4.16

diff --git a/...tests-private/openshift-openshift-tests-private-release-4.16__amd64-rollback-nightly.yaml b/...tests-private/openshift-openshift-tests-private-release-4.16__amd64-rollback-nightly.yaml
@@ -58,12 +58,10 @@ build_root:
     tag: golang-1.18
 releases:
   latest:
-    candidate:
+    release:
       architecture: amd64
-      product: ocp
-      relative: 1
-      stream: nightly
-      version: "4.16"
+      channel: candidate
+      version: 4.16.0-rc.0
   target:
     candidate:
       architecture: amd64
@@ -85,19 +83,7 @@ tests:
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
     test:
-    - as: set-upgrade-releases
-      commands: echo "${RELEASE_IMAGE_TARGET},${RELEASE_IMAGE_LATEST}" > ${SHARED_DIR}/upgrade-edge
-      dependencies:
-      - env: RELEASE_IMAGE_TARGET
-        name: release:target
-      - env: RELEASE_IMAGE_LATEST
-        name: release:latest
-      from: cli
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    - ref: cucushift-chainupgrade-toimage
+    - chain: openshift-upgrade-qe-sanity-rollback
     workflow: cucushift-installer-rehearse-aws-ipi-byo-route53
 - as: aws-ipi-ovn-hypershift-inplace-f7
   cron: 34 23 7,14,23,30 * *
@@ -110,26 +96,14 @@ tests:
     test:
     - chain: openshift-upgrade-qe-test-hypershift-rollback
     workflow: cucushift-installer-rehearse-aws-ipi-ovn-hypershift-guest
-- as: azure-upi-f14
-  cron: 13 18 15,29 * *
+- as: azure-upi-f28
+  cron: 13 18 10 * *
   steps:
     cluster_profile: azure-qe
     env:
       BASE_DOMAIN: qe.azure.devcluster.openshift.com
     test:
-    - as: set-upgrade-releases
-      commands: echo "${RELEASE_IMAGE_TARGET},${RELEASE_IMAGE_LATEST}" > ${SHARED_DIR}/upgrade-edge
-      dependencies:
-      - env: RELEASE_IMAGE_TARGET
-        name: release:target
-      - env: RELEASE_IMAGE_LATEST
-        name: release:latest
-      from: cli
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    - ref: cucushift-chainupgrade-toimage
+    - chain: openshift-upgrade-qe-sanity-rollback
     workflow: cucushift-installer-rehearse-azure-upi
 - as: baremetal-ipi-ovn-ipv4-f28
   cluster: build05
@@ -163,78 +137,30 @@ tests:
   steps:
     cluster_profile: gcp-qe
     test:
-    - as: set-upgrade-releases
-      commands: echo "${RELEASE_IMAGE_TARGET},${RELEASE_IMAGE_LATEST}" > ${SHARED_DIR}/upgrade-edge
-      dependencies:
-      - env: RELEASE_IMAGE_TARGET
-        name: release:target
-      - env: RELEASE_IMAGE_LATEST
-        name: release:latest
-      from: cli
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    - ref: cucushift-chainupgrade-toimage
+    - chain: openshift-upgrade-qe-sanity-rollback
     workflow: cucushift-installer-rehearse-gcp-ipi-ovn-ipsec
 - as: ibmcloud-ipi-f28
   cron: 27 0 6 * *
   steps:
     cluster_profile: ibmcloud-qe
     test:
-    - as: set-upgrade-releases
-      commands: echo "${RELEASE_IMAGE_TARGET},${RELEASE_IMAGE_LATEST}" > ${SHARED_DIR}/upgrade-edge
-      dependencies:
-      - env: RELEASE_IMAGE_TARGET
-        name: release:target
-      - env: RELEASE_IMAGE_LATEST
-        name: release:latest
-      from: cli
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    - ref: cucushift-chainupgrade-toimage
+    - chain: openshift-upgrade-qe-sanity-rollback
     workflow: cucushift-installer-rehearse-ibmcloud-ipi
-- as: nutanix-ipi-f28
+- as: nutanix-ipi-boot-categories-project-f28
   cluster: build01
   cron: 2 14 3 * *
   steps:
     cluster_profile: nutanix-qe
     test:
-    - as: set-upgrade-releases
-      commands: echo "${RELEASE_IMAGE_TARGET},${RELEASE_IMAGE_LATEST}" > ${SHARED_DIR}/upgrade-edge
-      dependencies:
-      - env: RELEASE_IMAGE_TARGET
-        name: release:target
-      - env: RELEASE_IMAGE_LATEST
-        name: release:latest
-      from: cli
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
     - ref: nutanix-upgrade-pre-config
-    - ref: cucushift-chainupgrade-toimage
+    - chain: openshift-upgrade-qe-sanity-rollback
     workflow: cucushift-installer-rehearse-nutanix-ipi-boot-categories-project
 - as: vsphere-upi-f28
   cron: 32 5 28 * *
   steps:
     cluster_profile: vsphere-2
     test:
-    - as: set-upgrade-releases
-      commands: echo "${RELEASE_IMAGE_TARGET},${RELEASE_IMAGE_LATEST}" > ${SHARED_DIR}/upgrade-edge
-      dependencies:
-      - env: RELEASE_IMAGE_TARGET
-        name: release:target
-      - env: RELEASE_IMAGE_LATEST
-        name: release:latest
-      from: cli
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    - ref: cucushift-chainupgrade-toimage
+    - chain: openshift-upgrade-qe-sanity-rollback
     workflow: cucushift-installer-rehearse-vsphere-upi
 zz_generated_metadata:
   branch: release-4.16

diff --git a/...ift/openshift-tests-private/openshift-openshift-tests-private-release-4.16-periodics.yaml b/...ift/openshift-tests-private/openshift-openshift-tests-private-release-4.16-periodics.yaml
@@ -38494,7 +38494,6 @@ periodics:
     ci-operator.openshift.io/cloud-cluster-profile: aws-qe
     ci-operator.openshift.io/variant: amd64-rollback-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-rollback-nightly-aws-ipi-byo-route53-f28
   spec:
@@ -38582,7 +38581,6 @@ periodics:
     ci-operator.openshift.io/cloud-cluster-profile: aws-qe
     ci-operator.openshift.io/variant: amd64-rollback-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-rollback-nightly-aws-ipi-ovn-hypershift-inplace-f7
   reporter_config:
@@ -38668,7 +38666,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build02
-  cron: 13 18 15,29 * *
+  cron: 13 18 10 * *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -38681,9 +38679,8 @@ periodics:
     ci-operator.openshift.io/cloud-cluster-profile: azure-qe
     ci-operator.openshift.io/variant: amd64-rollback-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-rollback-nightly-azure-upi-f14
+  name: periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-rollback-nightly-azure-upi-f28
   spec:
     containers:
     - args:
@@ -38693,8 +38690,8 @@ periodics:
       - --oauth-token-path=/usr/local/github-credentials/oauth
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/azure-upi-f14-cluster-profile
-      - --target=azure-upi-f14
+      - --secret-dir=/usr/local/azure-upi-f28-cluster-profile
+      - --target=azure-upi-f28
       - --variant=amd64-rollback-nightly
       command:
       - ci-operator
@@ -38711,7 +38708,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/azure-upi-f14-cluster-profile
+      - mountPath: /usr/local/azure-upi-f28-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials
@@ -38770,7 +38767,6 @@ periodics:
     ci-operator.openshift.io/cluster: build05
     ci-operator.openshift.io/variant: amd64-rollback-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-rollback-nightly-baremetal-ipi-ovn-ipv4-f28
   spec:
@@ -38858,7 +38854,6 @@ periodics:
     ci-operator.openshift.io/cloud-cluster-profile: gcp-qe
     ci-operator.openshift.io/variant: amd64-rollback-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-rollback-nightly-gcp-ipi-ovn-ipsec-f28
   spec:
@@ -38946,7 +38941,6 @@ periodics:
     ci-operator.openshift.io/cloud-cluster-profile: ibmcloud-qe
     ci-operator.openshift.io/variant: amd64-rollback-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-rollback-nightly-ibmcloud-ipi-f28
   spec:
@@ -39035,9 +39029,8 @@ periodics:
     ci-operator.openshift.io/cluster: build01
     ci-operator.openshift.io/variant: amd64-rollback-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-rollback-nightly-nutanix-ipi-f28
+  name: periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-rollback-nightly-nutanix-ipi-boot-categories-project-f28
   spec:
     containers:
     - args:
@@ -39047,8 +39040,8 @@ periodics:
       - --oauth-token-path=/usr/local/github-credentials/oauth
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --secret-dir=/usr/local/nutanix-ipi-f28-cluster-profile
-      - --target=nutanix-ipi-f28
+      - --secret-dir=/usr/local/nutanix-ipi-boot-categories-project-f28-cluster-profile
+      - --target=nutanix-ipi-boot-categories-project-f28
       - --variant=amd64-rollback-nightly
       command:
       - ci-operator
@@ -39065,7 +39058,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/nutanix-ipi-f28-cluster-profile
+      - mountPath: /usr/local/nutanix-ipi-boot-categories-project-f28-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials
@@ -39123,7 +39116,6 @@ periodics:
     ci-operator.openshift.io/cloud-cluster-profile: vsphere-2
     ci-operator.openshift.io/variant: amd64-rollback-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-rollback-nightly-vsphere-upi-f28
   spec:

diff --git a/ci-operator/step-registry/cucushift/upgrade/rollback/OWNERS b/ci-operator/step-registry/cucushift/upgrade/rollback/OWNERS
@@ -0,0 +1,10 @@
+approvers:
+  - jianlinliu
+  - jiajliu
+  - shellyyang1989
+  - jhou1
+reviewers:
+  - jiajliu
+  - jianlinliu
+  - shellyyang1989
+  - jhou1