replace-rollback test

openshift · Apr 28, 2024 · f02a789 · f02a789
1 parent 25db46b
commit f02a789
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
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
@@ -99,13 +99,12 @@ tests:
           memory: 200Mi
     - ref: cucushift-chainupgrade-toimage
     workflow: cucushift-installer-rehearse-aws-ipi-byo-route53
-- as: aws-ipi-ovn-hypershift-inplace-f7
+- as: aws-ipi-ovn-hypershift-replace-f7
   cron: 34 23 7,14,23,30 * *
   steps:
     cluster_profile: aws-qe
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-      EXTRA_ARGS: --node-upgrade-type=inplace
       TEST_FILTERS: ~DisconnectedOnly&;~HyperShiftMGMT&;~MicroShiftOnly&;~NonHyperShiftHOST&
     test:
     - chain: openshift-upgrade-qe-test-hypershift-rollback

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
@@ -38298,18 +38298,7 @@ periodics:
     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:
-    slack:
-      channel: '#forum-prow-hypershift-qe-ci'
-      job_states_to_report:
-      - failure
-      - error
-      - success
-      report_template: '{{if eq .Status.State "success"}} :rainbow: Upgrade 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}}'
+  name: periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-rollback-nightly-aws-ipi-ovn-hypershift-replace-f7
   spec:
     containers:
     - args:
@@ -38319,8 +38308,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/aws-ipi-ovn-hypershift-inplace-f7-cluster-profile
-      - --target=aws-ipi-ovn-hypershift-inplace-f7
+      - --secret-dir=/usr/local/aws-ipi-ovn-hypershift-replace-f7-cluster-profile
+      - --target=aws-ipi-ovn-hypershift-replace-f7
       - --variant=amd64-rollback-nightly
       command:
       - ci-operator
@@ -38337,7 +38326,7 @@ periodics:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
-      - mountPath: /usr/local/aws-ipi-ovn-hypershift-inplace-f7-cluster-profile
+      - mountPath: /usr/local/aws-ipi-ovn-hypershift-replace-f7-cluster-profile
         name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials

diff --git a/.../hypershift/guest/cucushift-installer-rehearse-aws-ipi-ovn-hypershift-guest-workflow.yaml b/.../hypershift/guest/cucushift-installer-rehearse-aws-ipi-ovn-hypershift-guest-workflow.yaml
@@ -6,6 +6,7 @@ workflow:
     - ref: cucushift-hypershift-extended-idp-htpasswd
     - ref: cucushift-hypershift-extended-enable-guest
     post:
+    - ref: wait
     - ref: cucushift-hypershift-extended-disable-guest
     - chain: cucushift-installer-rehearse-aws-ipi-ovn-hypershift-deprovision
   documentation: |-