hypershift: fix upgrade-hypershift-operator jobs on release branches <= 4.22

ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19.yaml

@@ -11,7 +11,7 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  hypershift-operator-init:
+  hypershift-operator-419-latest:
     name: hypershift-operator
     namespace: hypershift
     tag: "4.19"
@@ -25,17 +25,17 @@ build_root:
 canonical_go_repository: github.com/openshift/hypershift
 images:
   items:
-  - to: hypershift-operator-419
+  - to: hypershift-operator-pr
   - dockerfile_path: Dockerfile.control-plane
     to: hypershift
 promotion:
   to:
   - excluded_images:
-    - hypershift-operator-419
+    - hypershift-operator-pr
     name: 4.19-priv
     namespace: ocp-private
   - additional_images:
-      hypershift-operator: hypershift-operator-419
+      hypershift-operator: hypershift-operator-pr
     disabled: true
     excluded_images:
     - '*'
@@ -192,9 +192,11 @@ tests:
   steps:
     cluster_profile: hypershift-aws
     dependencies:
-      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-init
+      CI_HYPERSHIFT_OPERATOR: hypershift-operator-pr
+      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-419-latest
     env:
       CI_TESTS_RUN: ^TestUpgradeHyperShiftOperator$
+      ENABLE_SCALE_FROM_ZERO: "false"
       INSTALL_FROM_LATEST: "true"
       RUN_UPGRADE_TEST: "true"
     workflow: hypershift-aws-e2e-nested

ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20.yaml

@@ -11,7 +11,7 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  hypershift-operator-init:
+  hypershift-operator-420-latest:
     name: hypershift-operator
     namespace: hypershift
     tag: "4.20"
@@ -25,7 +25,7 @@ build_root:
 canonical_go_repository: github.com/openshift/hypershift
 images:
   items:
-  - to: hypershift-operator-420
+  - to: hypershift-operator-pr
   - dockerfile_path: Dockerfile.control-plane
     to: hypershift
   - dockerfile_literal: |
@@ -36,11 +36,11 @@ images:
 promotion:
   to:
   - excluded_images:
-    - hypershift-operator-420
+    - hypershift-operator-pr
     name: 4.20-priv
     namespace: ocp-private
   - additional_images:
-      hypershift-operator: hypershift-operator-420
+      hypershift-operator: hypershift-operator-pr
     disabled: true
     excluded_images:
     - '*'
@@ -197,9 +197,11 @@ tests:
   steps:
     cluster_profile: hypershift-aws
     dependencies:
-      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-init
+      CI_HYPERSHIFT_OPERATOR: hypershift-operator-pr
+      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-420-latest
     env:
       CI_TESTS_RUN: ^TestUpgradeHyperShiftOperator$
+      ENABLE_SCALE_FROM_ZERO: "false"
       INSTALL_FROM_LATEST: "true"
       RUN_UPGRADE_TEST: "true"
     workflow: hypershift-aws-e2e-nested

ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.21.yaml

@@ -11,7 +11,7 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  hypershift-operator-init:
+  hypershift-operator-421-latest:
     name: hypershift-operator
     namespace: hypershift
     tag: "4.21"
@@ -25,7 +25,7 @@ build_root:
 canonical_go_repository: github.com/openshift/hypershift
 images:
   items:
-  - to: hypershift-operator-421
+  - to: hypershift-operator-pr
   - dockerfile_path: Dockerfile.control-plane
     to: hypershift
   - dockerfile_literal: |
@@ -36,11 +36,11 @@ images:
 promotion:
   to:
   - excluded_images:
-    - hypershift-operator-421
+    - hypershift-operator-pr
     name: 4.21-priv
     namespace: ocp-private
   - additional_images:
-      hypershift-operator: hypershift-operator-421
+      hypershift-operator: hypershift-operator-pr
     disabled: true
     excluded_images:
     - '*'
@@ -217,9 +217,11 @@ tests:
   steps:
     cluster_profile: hypershift-aws
     dependencies:
-      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-init
+      CI_HYPERSHIFT_OPERATOR: hypershift-operator-pr
+      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-421-latest
     env:
       CI_TESTS_RUN: ^TestUpgradeHyperShiftOperator$
+      ENABLE_SCALE_FROM_ZERO: "false"
       INSTALL_FROM_LATEST: "true"
       RUN_UPGRADE_TEST: "true"
     workflow: hypershift-aws-e2e-nested

ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.22.yaml

@@ -15,7 +15,7 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  hypershift-operator-init:
+  hypershift-operator-422-latest:
     name: hypershift-operator
     namespace: hypershift
     tag: "4.22"
@@ -29,17 +29,17 @@ build_root:
 canonical_go_repository: github.com/openshift/hypershift
 images:
   items:
-  - to: hypershift-operator-422
+  - to: hypershift-operator-pr
   - dockerfile_path: Dockerfile.control-plane
     to: hypershift
 promotion:
   to:
   - excluded_images:
-    - hypershift-operator-422
+    - hypershift-operator-pr
     name: 4.22-priv
     namespace: ocp-private
   - additional_images:
-      hypershift-operator: hypershift-operator-422
+      hypershift-operator: hypershift-operator-pr
     disabled: true
     excluded_images:
     - '*'
@@ -307,7 +307,8 @@ tests:
   steps:
     cluster_profile: hypershift-aws
     dependencies:
-      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-init
+      CI_HYPERSHIFT_OPERATOR: hypershift-operator-pr
+      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-422-latest
     env:
       CI_TESTS_RUN: ^TestUpgradeHyperShiftOperator$
       INSTALL_FROM_LATEST: "true"

ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19.yaml

@@ -11,7 +11,7 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  hypershift-operator-init:
+  hypershift-operator-419-latest:
     name: hypershift-operator
     namespace: hypershift
     tag: "4.19"
@@ -24,17 +24,17 @@ build_root:
   use_build_cache: true
 images:
   items:
-  - to: hypershift-operator-419
+  - to: hypershift-operator-pr
   - dockerfile_path: Dockerfile.control-plane
     to: hypershift
 promotion:
   to:
   - excluded_images:
-    - hypershift-operator-419
+    - hypershift-operator-pr
     name: "4.19"
     namespace: ocp
   - additional_images:
-      hypershift-operator: hypershift-operator-419
+      hypershift-operator: hypershift-operator-pr
     excluded_images:
     - '*'
     namespace: hypershift
@@ -188,9 +188,11 @@ tests:
   steps:
     cluster_profile: hypershift-aws
     dependencies:
-      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-init
+      CI_HYPERSHIFT_OPERATOR: hypershift-operator-pr
+      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-419-latest
     env:
       CI_TESTS_RUN: ^TestUpgradeHyperShiftOperator$
+      ENABLE_SCALE_FROM_ZERO: "false"
       INSTALL_FROM_LATEST: "true"
       RUN_UPGRADE_TEST: "true"
     workflow: hypershift-aws-e2e-nested

ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.20.yaml

@@ -11,7 +11,7 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  hypershift-operator-init:
+  hypershift-operator-420-latest:
     name: hypershift-operator
     namespace: hypershift
     tag: "4.20"
@@ -24,7 +24,7 @@ build_root:
   use_build_cache: true
 images:
   items:
-  - to: hypershift-operator-420
+  - to: hypershift-operator-pr
   - dockerfile_path: Dockerfile.control-plane
     to: hypershift
   - dockerfile_literal: |
@@ -35,11 +35,11 @@ images:
 promotion:
   to:
   - excluded_images:
-    - hypershift-operator-420
+    - hypershift-operator-pr
     name: "4.20"
     namespace: ocp
   - additional_images:
-      hypershift-operator: hypershift-operator-420
+      hypershift-operator: hypershift-operator-pr
     excluded_images:
     - '*'
     namespace: hypershift
@@ -193,9 +193,11 @@ tests:
   steps:
     cluster_profile: hypershift-aws
     dependencies:
-      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-init
+      CI_HYPERSHIFT_OPERATOR: hypershift-operator-pr
+      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-420-latest
     env:
       CI_TESTS_RUN: ^TestUpgradeHyperShiftOperator$
+      ENABLE_SCALE_FROM_ZERO: "false"
       INSTALL_FROM_LATEST: "true"
       RUN_UPGRADE_TEST: "true"
     workflow: hypershift-aws-e2e-nested

ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.21.yaml

@@ -11,7 +11,7 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  hypershift-operator-init:
+  hypershift-operator-421-latest:
     name: hypershift-operator
     namespace: hypershift
     tag: "4.21"
@@ -24,7 +24,7 @@ build_root:
   use_build_cache: true
 images:
   items:
-  - to: hypershift-operator-421
+  - to: hypershift-operator-pr
   - dockerfile_path: Dockerfile.control-plane
     to: hypershift
   - dockerfile_literal: |
@@ -35,11 +35,11 @@ images:
 promotion:
   to:
   - excluded_images:
-    - hypershift-operator-421
+    - hypershift-operator-pr
     name: "4.21"
     namespace: ocp
   - additional_images:
-      hypershift-operator: hypershift-operator-421
+      hypershift-operator: hypershift-operator-pr
     excluded_images:
     - '*'
     namespace: hypershift
@@ -213,9 +213,11 @@ tests:
   steps:
     cluster_profile: hypershift-aws
     dependencies:
-      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-init
+      CI_HYPERSHIFT_OPERATOR: hypershift-operator-pr
+      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-421-latest
     env:
       CI_TESTS_RUN: ^TestUpgradeHyperShiftOperator$
+      ENABLE_SCALE_FROM_ZERO: "false"
       INSTALL_FROM_LATEST: "true"
       RUN_UPGRADE_TEST: "true"
     workflow: hypershift-aws-e2e-nested

ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22.yaml

@@ -15,7 +15,7 @@ base_images:
     name: hypershift-operator
     namespace: hypershift
     tag: latest
-  hypershift-operator-init:
+  hypershift-operator-422-latest:
     name: hypershift-operator
     namespace: hypershift
     tag: "4.22"
@@ -28,17 +28,17 @@ build_root:
   use_build_cache: true
 images:
   items:
-  - to: hypershift-operator-422
+  - to: hypershift-operator-pr
   - dockerfile_path: Dockerfile.control-plane
     to: hypershift
 promotion:
   to:
   - excluded_images:
-    - hypershift-operator-422
+    - hypershift-operator-pr
     name: "4.22"
     namespace: ocp
   - additional_images:
-      hypershift-operator: hypershift-operator-422
+      hypershift-operator: hypershift-operator-pr
     excluded_images:
     - '*'
     namespace: hypershift
@@ -303,7 +303,8 @@ tests:
   steps:
     cluster_profile: hypershift-aws
     dependencies:
-      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-init
+      CI_HYPERSHIFT_OPERATOR: hypershift-operator-pr
+      HYPERSHIFT_RELEASE_LATEST: hypershift-operator-422-latest
     env:
       CI_TESTS_RUN: ^TestUpgradeHyperShiftOperator$
       INSTALL_FROM_LATEST: "true"

ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19-postsubmits.yaml

@@ -31,7 +31,7 @@ postsubmits:
         - --promote
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-419
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest

ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19-presubmits.yaml

@@ -1363,7 +1363,7 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-419
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest

ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20-postsubmits.yaml

@@ -31,7 +31,7 @@ postsubmits:
         - --promote
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-420
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest

ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20-presubmits.yaml

@@ -1553,7 +1553,7 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-420
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest

ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.21-postsubmits.yaml

@@ -31,7 +31,7 @@ postsubmits:
         - --promote
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-421
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest

ci-operator/jobs/openshift-priv/hypershift/openshift-priv-hypershift-release-4.21-presubmits.yaml

@@ -1840,7 +1840,7 @@ presubmits:
         - --oauth-token-path=/usr/local/github-credentials/oauth
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
-        - --target=hypershift-operator-421
+        - --target=hypershift-operator-pr
         command:
         - ci-operator
         image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest