openshift · wking · Oct 20, 2020 · vrutkovs · Mar 8, 2021 · wking
diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml
@@ -260,8 +260,8 @@ tests:
   steps:
     cluster_profile: aws
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
     workflow: openshift-upgrade-aws
 - as: e2e-aws-serial
   steps:

diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7.yaml
@@ -260,8 +260,8 @@ tests:
   steps:
     cluster_profile: aws
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
     workflow: openshift-upgrade-aws
 - as: e2e-aws-serial
   steps:

diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.8.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.8.yaml
@@ -261,8 +261,8 @@ tests:
   steps:
     cluster_profile: aws
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
     workflow: openshift-upgrade-aws
 - as: e2e-aws-serial
   steps:

diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.9.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.9.yaml
@@ -259,9 +259,6 @@ tests:
 - as: e2e-aws-selfupgrade
   steps:
     cluster_profile: aws
-    dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
     workflow: openshift-upgrade-aws
 - as: e2e-aws-serial
   steps:

diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
@@ -260,8 +260,8 @@ tests:
   steps:
     cluster_profile: aws
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
     workflow: openshift-upgrade-aws
 - as: e2e-aws-serial
   steps:

diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.7.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.7.yaml
@@ -260,8 +260,8 @@ tests:
   steps:
     cluster_profile: aws
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
     workflow: openshift-upgrade-aws
 - as: e2e-aws-serial
   steps:

diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.8.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.8.yaml
@@ -261,8 +261,8 @@ tests:
   steps:
     cluster_profile: aws
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
     workflow: openshift-upgrade-aws
 - as: e2e-aws-serial
   steps:

diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.9.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.9.yaml
@@ -259,9 +259,6 @@ tests:
 - as: e2e-aws-selfupgrade
   steps:
     cluster_profile: aws
-    dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
     workflow: openshift-upgrade-aws
 - as: e2e-aws-serial
   steps:

diff --git a/ci-operator/step-registry/ipi/conf/ipi-conf-commands.sh b/ci-operator/step-registry/ipi/conf/ipi-conf-commands.sh
@@ -8,12 +8,12 @@ cluster_name=${NAMESPACE}-${JOB_NAME_HASH}
 
 out=${SHARED_DIR}/install-config.yaml
 
-if [[ -z "$RELEASE_IMAGE_LATEST" ]]; then
-  echo "RELEASE_IMAGE_LATEST is an empty string, exiting"
+if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE" ]]; then
+  echo "OPENSHIFT_INSTALL_RELEASE_IMAGE is an empty string, exiting"
   exit 1
 fi
 
-echo "Installing from release ${RELEASE_IMAGE_LATEST}"
+echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE}"
 
 ssh_pub_key=$(<"${CLUSTER_PROFILE_DIR}/ssh-publickey")
 pull_secret=$(<"${CLUSTER_PROFILE_DIR}/pull-secret")

diff --git a/ci-operator/step-registry/ipi/conf/ipi-conf-ref.yaml b/ci-operator/step-registry/ipi/conf/ipi-conf-ref.yaml
@@ -5,6 +5,9 @@ ref:
    name: centos
    tag: '8'
   commands: ipi-conf-commands.sh
+  dependencies:
+  - name: "release:latest"
+    env: OPENSHIFT_INSTALL_RELEASE_IMAGE
   resources:
     requests:
       cpu: 10m

diff --git a/ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh b/ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh
@@ -37,12 +37,13 @@ function prepare_next_steps() {
 trap 'prepare_next_steps' EXIT
 trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
 
-if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE" ]]; then
-  echo "OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE is an empty string, exiting"
+if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE" ]]; then
+  echo "OPENSHIFT_INSTALL_RELEASE_IMAGE is an empty string, exiting"
   exit 1
 fi
 
-echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}"
+echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE}"
+export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="${OPENSHIFT_INSTALL_RELEASE_IMAGE}"
 export SSH_PRIV_KEY_PATH=${CLUSTER_PROFILE_DIR}/ssh-privatekey
 export PULL_SECRET_PATH=${CLUSTER_PROFILE_DIR}/pull-secret
 export OPENSHIFT_INSTALL_INVOKER=openshift-internal-ci/${JOB_NAME}/${BUILD_ID}

diff --git a/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml b/ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml
@@ -2,14 +2,12 @@ ref:
   as: ipi-install-install
   from: installer
   commands: ipi-install-install-commands.sh
+  dependencies:
+  - name: "release:latest"
+    env: OPENSHIFT_INSTALL_RELEASE_IMAGE
   resources:
     requests:
       cpu: 1000m
       memory: 2Gi
-  dependencies:
-  - name: "release:latest"
-    env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
-  - name: "release:latest"
-    env: RELEASE_IMAGE_LATEST
   documentation: |-
     The IPI install step runs the OpenShift Installer in order to bring up an OpenShift cluster, using the provided cluster profile to choose a target IaaS platform. Anything that needs to be configured using manifests should generate them before this step and put them in the SHARED_DIR with the filename manifest_(manifest_name).yml so that this step can pull in the manifest in.
diff --git a/...tep-registry/ipi/install/install/stableinitial/ipi-install-install-stableinitial-ref.yaml b/...tep-registry/ipi/install/install/stableinitial/ipi-install-install-stableinitial-ref.yaml
@@ -8,8 +8,6 @@ ref:
       memory: 2Gi
   dependencies:
   - name: "release:latest"
-    env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
-  - name: "release:latest"
-    env: RELEASE_IMAGE_LATEST
+    env: OPENSHIFT_INSTALL_RELEASE_IMAGE
   documentation: |-
     The IPI install step runs the OpenShift Installer from stable-initial imagestream in order to bring up an OpenShift cluster, using the provided cluster profile to choose a target IaaS platform. Anything that needs to be configured using manifests should generate them before this step and put them in the SHARED_DIR with the filename manifest_(manifest_name).yml so that this step can pull in the manifest in.
diff --git a/...rator/step-registry/ipi/install/kubevirt/install/ipi-install-kubevirt-install-commands.sh b/...rator/step-registry/ipi/install/kubevirt/install/ipi-install-kubevirt-install-commands.sh
@@ -6,12 +6,13 @@ set -o pipefail
 
 trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
 
-if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE" ]]; then
-  echo "OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE is an empty string, exiting"
+if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE" ]]; then
+  echo "OPENSHIFT_INSTALL_RELEASE_IMAGE is an empty string, exiting"
   exit 1
 fi
 
-echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}"
+echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE}"
+export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="${OPENSHIFT_INSTALL_RELEASE_IMAGE}"
 export SSH_PRIV_KEY_PATH=${CLUSTER_PROFILE_DIR}/ssh-privatekey
 export PULL_SECRET_PATH=${CLUSTER_PROFILE_DIR}/pull-secret
 export OPENSHIFT_INSTALL_INVOKER=openshift-internal-ci/${JOB_NAME}/${BUILD_ID}

diff --git a/ci-operator/step-registry/ipi/install/kubevirt/install/ipi-install-kubevirt-install-ref.yaml b/ci-operator/step-registry/ipi/install/kubevirt/install/ipi-install-kubevirt-install-ref.yaml
@@ -8,9 +8,7 @@ ref:
       memory: 2Gi
   dependencies:
   - name: "release:latest"
-    env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
-  - name: "release:latest"
-    env: RELEASE_IMAGE_LATEST
+    env: OPENSHIFT_INSTALL_RELEASE_IMAGE
   credentials:
     - mount_path: /tmp/secret-kube
       name: cluster-secrets-kubevirt

diff --git a/...tor/step-registry/ipi/install/ovirt/prepare-env/ipi-install-ovirt-prepare-env-commands.sh b/...tor/step-registry/ipi/install/ovirt/prepare-env/ipi-install-ovirt-prepare-env-commands.sh
@@ -4,10 +4,4 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE" ]]; then
-  echo "OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE is an empty string, exiting"
-  exit 1
-fi
-echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}"
-
 cp "${CLUSTER_PROFILE_DIR}/csi-test-manifest.yaml" "${SHARED_DIR}"
diff --git a/...erator/step-registry/ipi/install/ovirt/prepare-env/ipi-install-ovirt-prepare-env-ref.yaml b/...erator/step-registry/ipi/install/ovirt/prepare-env/ipi-install-ovirt-prepare-env-ref.yaml
@@ -5,11 +5,6 @@ ref:
     namespace: ocp
     tag: latest
   commands: ipi-install-ovirt-prepare-env-commands.sh
-  dependencies:
-  - name: "release:latest"
-    env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
-  - name: "release:latest"
-    env: RELEASE_IMAGE_LATEST
   resources:
     requests:
       cpu: 10m

diff --git a/ci-operator/step-registry/ipi/install/vsphere/ipi-install-vsphere-ref.yaml b/ci-operator/step-registry/ipi/install/vsphere/ipi-install-vsphere-ref.yaml
@@ -8,9 +8,7 @@ ref:
       memory: 2Gi
   dependencies:
   - name: "release:latest"
-    env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
-  - name: "release:latest"
-    env: RELEASE_IMAGE_LATEST
+    env: OPENSHIFT_INSTALL_RELEASE_IMAGE
   documentation: >-
     The vSphere IPI install step runs the OpenShift Installer in order to bring
     up an OpenShift cluster. Unlike the other IPI installs, the installer image

diff --git a/ci-operator/step-registry/openshift/e2e/gcp/crc/test/openshift-e2e-gcp-crc-test-commands.sh b/ci-operator/step-registry/openshift/e2e/gcp/crc/test/openshift-e2e-gcp-crc-test-commands.sh
@@ -91,4 +91,4 @@ LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute --project "${GOOGLE_PROJE
 LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute --project "${GOOGLE_PROJECT_ID}" ssh \
   --zone "${GOOGLE_COMPUTE_ZONE}" \
   packer@"${INSTANCE_PREFIX}" \
-  --command "export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${RELEASE_IMAGE_LATEST}  && timeout 360m bash -ce \"/home/packer/run-tests.sh\""
+  --command "export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${OPENSHIFT_INSTALL_RELEASE_IMAGE}  && timeout 360m bash -ce \"/home/packer/run-tests.sh\""
diff --git a/ci-operator/step-registry/openshift/e2e/gcp/crc/test/openshift-e2e-gcp-crc-test-ref.yaml b/ci-operator/step-registry/openshift/e2e/gcp/crc/test/openshift-e2e-gcp-crc-test-ref.yaml
@@ -2,6 +2,9 @@ ref:
   as: openshift-e2e-gcp-crc-test
   from: libvirt-installer
   commands: openshift-e2e-gcp-crc-test-commands.sh
+  dependencies:
+  - name: "release:latest"
+    env: OPENSHIFT_INSTALL_RELEASE_IMAGE
   resources:
     requests:
       cpu: 10m

diff --git a/...ep-registry/openshift/e2e/ovirt/minimal/test/openshift-e2e-ovirt-minimal-test-commands.sh b/...ep-registry/openshift/e2e/ovirt/minimal/test/openshift-e2e-ovirt-minimal-test-commands.sh
@@ -121,7 +121,7 @@ fi
 function upgrade() {
     set -x
     openshift-tests run-upgrade all \
-        --to-image "${OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE}" \
+        --to-image "${OPENSHIFT_UPGRADE_RELEASE_IMAGE}" \
         --options "${TEST_UPGRADE_OPTIONS-}" \
         --provider "${TEST_PROVIDER}" \
         -o "${ARTIFACT_DIR}/e2e.log" \

diff --git a/.../step-registry/openshift/e2e/ovirt/minimal/test/openshift-e2e-ovirt-minimal-test-ref.yaml b/.../step-registry/openshift/e2e/ovirt/minimal/test/openshift-e2e-ovirt-minimal-test-ref.yaml
@@ -16,7 +16,7 @@ ref:
                     suite to verify the cluster is still functional. This is typically used for testing
                     disruption from one suite, then confirming that the disruption did not degrade the
                     product.
-        * 'upgrade' - Perform an upgrade to the image defined by OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE.
+        * 'upgrade' - Perform an upgrade to the image defined by OPENSHIFT_UPGRADE_RELEASE_IMAGE.
                     The TEST_UPGRADE_OPTIONS flag may be optionally set. All product components
                     must run the default upgrade test (verify an upgrade completes) on pull requests
                     prior to merge.
@@ -45,7 +45,7 @@ ref:
         details. The file must be present in ${SHARED_DIR}.
   dependencies:
     - name: "release:latest"
-      env: OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE
+      env: OPENSHIFT_UPGRADE_RELEASE_IMAGE
   resources:
     requests:
       cpu: "3"

diff --git a/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh b/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh
@@ -121,7 +121,7 @@ fi
 function upgrade() {
     set -x
     openshift-tests run-upgrade all \
-        --to-image "${OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE}" \
+        --to-image "${OPENSHIFT_UPGRADE_RELEASE_IMAGE}" \
         --options "${TEST_UPGRADE_OPTIONS-}" \
         --provider "${TEST_PROVIDER}" \
         -o "${ARTIFACT_DIR}/e2e.log" \

diff --git a/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-ref.yaml b/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-ref.yaml
@@ -3,6 +3,9 @@ ref:
   from: tests
   commands: openshift-e2e-test-commands.sh
   timeout: 10800s
+  dependencies:
+  - name: "release:latest"
+    env: OPENSHIFT_UPGRADE_RELEASE_IMAGE
   env:
   - name: TEST_TYPE
     default: "suite"
@@ -16,7 +19,7 @@ ref:
                   suite to verify the cluster is still functional. This is typically used for testing
                   disruption from one suite, then confirming that the disruption did not degrade the
                   product.
-      * 'upgrade' - Perform an upgrade to the image defined by OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE.
+      * 'upgrade' - Perform an upgrade to the image defined by OPENSHIFT_UPGRADE_RELEASE_IMAGE.
                   The TEST_UPGRADE_OPTIONS flag may be optionally set. All product components
                   must run the default upgrade test (verify an upgrade completes) on pull requests
                   prior to merge.
@@ -49,9 +52,6 @@ ref:
       Name of the CSI driver manifest file to use.  Used by the `openshift-tests`
       program as TEST_CSI_DRIVER_FILES env. var., see its documentation for
       details. The file must be present in ${SHARED_DIR}.
-  dependencies:
-  - name: "release:latest"
-    env: OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE
   resources:
     requests:
       cpu: "3"

diff --git a/ci-operator/step-registry/openshift/upgrade/aws/openshift-upgrade-aws-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/aws/openshift-upgrade-aws-workflow.yaml
@@ -11,8 +11,7 @@ workflow:
     - ref: openshift-e2e-test-capabilities-check
     - chain: ipi-aws-post
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
     env:
       TEST_TYPE: upgrade
       TEST_SUITE: ""

diff --git a/ci-operator/step-registry/openshift/upgrade/aws/ovn/openshift-upgrade-aws-ovn-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/aws/ovn/openshift-upgrade-aws-ovn-workflow.yaml
@@ -15,8 +15,8 @@ workflow:
     - chain: gather-core-dump
     - chain: ipi-aws-post
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
     env:
       TEST_TYPE: upgrade
       TEST_SUITE: ""

diff --git a/ci-operator/step-registry/openshift/upgrade/azure/openshift-upgrade-azure-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/azure/openshift-upgrade-azure-workflow.yaml
@@ -10,8 +10,7 @@ workflow:
     post:
     - chain: ipi-azure-post
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
     env:
       TEST_TYPE: upgrade
       TEST_SUITE: ""

diff --git a/...rator/step-registry/openshift/upgrade/azure/ovn/openshift-upgrade-azure-ovn-workflow.yaml b/...rator/step-registry/openshift/upgrade/azure/ovn/openshift-upgrade-azure-ovn-workflow.yaml
@@ -14,8 +14,8 @@ workflow:
     - chain: gather-core-dump
     - chain: ipi-azure-post
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
     env:
       TEST_TYPE: upgrade
       TEST_SUITE: ""

diff --git a/ci-operator/step-registry/openshift/upgrade/gcp/openshift-upgrade-gcp-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/gcp/openshift-upgrade-gcp-workflow.yaml
@@ -10,8 +10,8 @@ workflow:
     post:
     - chain: ipi-gcp-post
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
     env:
       TEST_TYPE: upgrade
       TEST_SUITE: ""

diff --git a/ci-operator/step-registry/openshift/upgrade/gcp/ovn/openshift-upgrade-gcp-ovn-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/gcp/ovn/openshift-upgrade-gcp-ovn-workflow.yaml
@@ -13,8 +13,8 @@ workflow:
     - chain: gather-network
     - chain: ipi-gcp-post
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
     env:
       TEST_TYPE: upgrade
       TEST_SUITE: ""

diff --git a/...-registry/openshift/upgrade/openstack/loki/openshift-upgrade-openstack-loki-workflow.yaml b/...-registry/openshift/upgrade/openstack/loki/openshift-upgrade-openstack-loki-workflow.yaml
@@ -10,8 +10,8 @@ workflow:
     post:
     - chain: ipi-openstack-post
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
     env:
       TEST_TYPE: upgrade
       TEST_SUITE: ""

diff --git a/ci-operator/step-registry/openshift/upgrade/ovirt/openshift-upgrade-ovirt-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/ovirt/openshift-upgrade-ovirt-workflow.yaml
@@ -12,8 +12,8 @@ workflow:
       TEST_TYPE: upgrade
       TEST_UPGRADE_OPTIONS: ""
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
   documentation: |-
     The Openshift E2E oVirt upgrade workflow installs OpenShift cluster on top of oVirt
     and executes an upgrade to the next available version.
diff --git a/...try/openshift/upgrade/ovirt/without-csi/openshift-upgrade-ovirt-without-csi-workflow.yaml b/...try/openshift/upgrade/ovirt/without-csi/openshift-upgrade-ovirt-without-csi-workflow.yaml
@@ -12,8 +12,8 @@ workflow:
       TEST_TYPE: upgrade
       TEST_UPGRADE_OPTIONS: ""
     dependencies:
-      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
-      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
+      OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
   documentation: |-
     The Openshift E2E oVirt upgrade without csi workflow installs OpenShift cluster on top of oVirt
     from releases that didn't contain the oVirt csi driver, therfor patch the image registry.