Skip to content

Commit eb611c1

Browse files
wkingwking
committed
ci-operator/step-registry: Unify OPENSHIFT_*_RELEASE_IMAGE dependencies
Tests generally install one OpenShift release, and then perform some actions to validate that release. Sometimes the actions include updating to a different release, or a series of different releases. With this commit, I'm pivoting to dependency naming that more clearly reflects these goals, instead of "RELEASE_IMAGE_LATEST", which was a reflection of the default release:latest value, and not an expression of the intended semantics. I've shifted to explicitly declaring these image dependencies, taking advantage of openshift/ci-tools@782008c873 (ci-operator: allow users to depend on images in steps, 2020-07-30, openshift/ci-tools#1044), instead of relying on the implicit RELEASE_IMAGE_LATEST and similar. I've dropped explicit dependencies that were not used in a step's associated commands, like RELEASE_IMAGE_LATEST in ipi-install since eb8eb32 (step-registry: add upgrade workflows, 2020-08-25, #11247). I've dropped explicit dependency overrides that set the same value as the default. For example, there was no need to set: OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest" in openshift-upgrade-aws-loki, because release:latest is already the default in all steps that consume OPENSHIFT_UPGRADE_RELEASE_IMAGE. I've dropped the _OVERRIDE suffix from the dependencies, because while we may set that suffix when communicating with the openshift-install command, it's a legitimate knob and not a strange override in each steps' public API.
1 parent 7ef731c commit eb611c1

File tree

38 files changed

+74
-87
lines changed

38 files changed

+74
-87
lines changed

‎ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ tests:
260260
steps:
261261
cluster_profile: aws
262262
dependencies:
263-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
264-
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
263+
OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
264+
OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
265265
workflow: openshift-upgrade-aws
266266
- as: e2e-aws-serial
267267
steps:

‎ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ tests:
260260
steps:
261261
cluster_profile: aws
262262
dependencies:
263-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
264-
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
263+
OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
264+
OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
265265
workflow: openshift-upgrade-aws
266266
- as: e2e-aws-serial
267267
steps:

‎ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.8.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ tests:
261261
steps:
262262
cluster_profile: aws
263263
dependencies:
264-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
265-
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
264+
OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
265+
OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
266266
workflow: openshift-upgrade-aws
267267
- as: e2e-aws-serial
268268
steps:

‎ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.9.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,6 @@ tests:
259259
- as: e2e-aws-selfupgrade
260260
steps:
261261
cluster_profile: aws
262-
dependencies:
263-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
264-
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
265262
workflow: openshift-upgrade-aws
266263
- as: e2e-aws-serial
267264
steps:

‎ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ tests:
260260
steps:
261261
cluster_profile: aws
262262
dependencies:
263-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
264-
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
263+
OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
264+
OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
265265
workflow: openshift-upgrade-aws
266266
- as: e2e-aws-serial
267267
steps:

‎ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.7.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ tests:
260260
steps:
261261
cluster_profile: aws
262262
dependencies:
263-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
264-
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
263+
OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
264+
OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
265265
workflow: openshift-upgrade-aws
266266
- as: e2e-aws-serial
267267
steps:

‎ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.8.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ tests:
261261
steps:
262262
cluster_profile: aws
263263
dependencies:
264-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
265-
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
264+
OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest
265+
OPENSHIFT_UPGRADE_RELEASE_IMAGE: release:initial
266266
workflow: openshift-upgrade-aws
267267
- as: e2e-aws-serial
268268
steps:

‎ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.9.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,6 @@ tests:
259259
- as: e2e-aws-selfupgrade
260260
steps:
261261
cluster_profile: aws
262-
dependencies:
263-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
264-
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
265262
workflow: openshift-upgrade-aws
266263
- as: e2e-aws-serial
267264
steps:

‎ci-operator/step-registry/ipi/conf/ipi-conf-commands.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ cluster_name=${NAMESPACE}-${JOB_NAME_HASH}
88

99
out=${SHARED_DIR}/install-config.yaml
1010

11-
if [[ -z "$RELEASE_IMAGE_LATEST" ]]; then
12-
echo "RELEASE_IMAGE_LATEST is an empty string, exiting"
11+
if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE" ]]; then
12+
echo "OPENSHIFT_INSTALL_RELEASE_IMAGE is an empty string, exiting"
1313
exit 1
1414
fi
1515

16-
echo "Installing from release ${RELEASE_IMAGE_LATEST}"
16+
echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE}"
1717

1818
ssh_pub_key=$(<"${CLUSTER_PROFILE_DIR}/ssh-publickey")
1919
pull_secret=$(<"${CLUSTER_PROFILE_DIR}/pull-secret")

‎ci-operator/step-registry/ipi/conf/ipi-conf-ref.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ ref:
55
name: centos
66
tag: '8'
77
commands: ipi-conf-commands.sh
8+
dependencies:
9+
- name: "release:latest"
10+
env: OPENSHIFT_INSTALL_RELEASE_IMAGE
811
resources:
912
requests:
1013
cpu: 10m

‎ci-operator/step-registry/ipi/install/install/ipi-install-install-commands.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,13 @@ function prepare_next_steps() {
3737
trap 'prepare_next_steps' EXIT
3838
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
3939

40-
if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE" ]]; then
41-
echo "OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE is an empty string, exiting"
40+
if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE" ]]; then
41+
echo "OPENSHIFT_INSTALL_RELEASE_IMAGE is an empty string, exiting"
4242
exit 1
4343
fi
4444

45-
echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}"
45+
echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE}"
46+
export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="${OPENSHIFT_INSTALL_RELEASE_IMAGE}"
4647
export SSH_PRIV_KEY_PATH=${CLUSTER_PROFILE_DIR}/ssh-privatekey
4748
export PULL_SECRET_PATH=${CLUSTER_PROFILE_DIR}/pull-secret
4849
export OPENSHIFT_INSTALL_INVOKER=openshift-internal-ci/${JOB_NAME}/${BUILD_ID}

‎ci-operator/step-registry/ipi/install/install/ipi-install-install-ref.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@ ref:
22
as: ipi-install-install
33
from: installer
44
commands: ipi-install-install-commands.sh
5+
dependencies:
6+
- name: "release:latest"
7+
env: OPENSHIFT_INSTALL_RELEASE_IMAGE
58
resources:
69
requests:
710
cpu: 1000m
811
memory: 2Gi
9-
dependencies:
10-
- name: "release:latest"
11-
env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
12-
- name: "release:latest"
13-
env: RELEASE_IMAGE_LATEST
1412
documentation: |-
1513
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.

‎ci-operator/step-registry/ipi/install/install/stableinitial/ipi-install-install-stableinitial-ref.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ ref:
88
memory: 2Gi
99
dependencies:
1010
- name: "release:latest"
11-
env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
12-
- name: "release:latest"
13-
env: RELEASE_IMAGE_LATEST
11+
env: OPENSHIFT_INSTALL_RELEASE_IMAGE
1412
documentation: |-
1513
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.

‎ci-operator/step-registry/ipi/install/kubevirt/install/ipi-install-kubevirt-install-commands.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ set -o pipefail
66

77
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
88

9-
if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE" ]]; then
10-
echo "OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE is an empty string, exiting"
9+
if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE" ]]; then
10+
echo "OPENSHIFT_INSTALL_RELEASE_IMAGE is an empty string, exiting"
1111
exit 1
1212
fi
1313

14-
echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}"
14+
echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE}"
15+
export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="${OPENSHIFT_INSTALL_RELEASE_IMAGE}"
1516
export SSH_PRIV_KEY_PATH=${CLUSTER_PROFILE_DIR}/ssh-privatekey
1617
export PULL_SECRET_PATH=${CLUSTER_PROFILE_DIR}/pull-secret
1718
export OPENSHIFT_INSTALL_INVOKER=openshift-internal-ci/${JOB_NAME}/${BUILD_ID}

‎ci-operator/step-registry/ipi/install/kubevirt/install/ipi-install-kubevirt-install-ref.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ ref:
88
memory: 2Gi
99
dependencies:
1010
- name: "release:latest"
11-
env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
12-
- name: "release:latest"
13-
env: RELEASE_IMAGE_LATEST
11+
env: OPENSHIFT_INSTALL_RELEASE_IMAGE
1412
credentials:
1513
- mount_path: /tmp/secret-kube
1614
name: cluster-secrets-kubevirt

‎ci-operator/step-registry/ipi/install/ovirt/prepare-env/ipi-install-ovirt-prepare-env-commands.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,4 @@ set -o nounset
44
set -o errexit
55
set -o pipefail
66

7-
if [[ -z "$OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE" ]]; then
8-
echo "OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE is an empty string, exiting"
9-
exit 1
10-
fi
11-
echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}"
12-
137
cp "${CLUSTER_PROFILE_DIR}/csi-test-manifest.yaml" "${SHARED_DIR}"

‎ci-operator/step-registry/ipi/install/ovirt/prepare-env/ipi-install-ovirt-prepare-env-ref.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ ref:
55
namespace: ocp
66
tag: latest
77
commands: ipi-install-ovirt-prepare-env-commands.sh
8-
dependencies:
9-
- name: "release:latest"
10-
env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
11-
- name: "release:latest"
12-
env: RELEASE_IMAGE_LATEST
138
resources:
149
requests:
1510
cpu: 10m

‎ci-operator/step-registry/ipi/install/vsphere/ipi-install-vsphere-ref.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ ref:
88
memory: 2Gi
99
dependencies:
1010
- name: "release:latest"
11-
env: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
12-
- name: "release:latest"
13-
env: RELEASE_IMAGE_LATEST
11+
env: OPENSHIFT_INSTALL_RELEASE_IMAGE
1412
documentation: >-
1513
The vSphere IPI install step runs the OpenShift Installer in order to bring
1614
up an OpenShift cluster. Unlike the other IPI installs, the installer image

‎ci-operator/step-registry/openshift/e2e/gcp/crc/test/openshift-e2e-gcp-crc-test-commands.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,4 @@ LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute --project "${GOOGLE_PROJE
9191
LD_PRELOAD=/usr/lib64/libnss_wrapper.so gcloud compute --project "${GOOGLE_PROJECT_ID}" ssh \
9292
--zone "${GOOGLE_COMPUTE_ZONE}" \
9393
packer@"${INSTANCE_PREFIX}" \
94-
--command "export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${RELEASE_IMAGE_LATEST} && timeout 360m bash -ce \"/home/packer/run-tests.sh\""
94+
--command "export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${OPENSHIFT_INSTALL_RELEASE_IMAGE} && timeout 360m bash -ce \"/home/packer/run-tests.sh\""

‎ci-operator/step-registry/openshift/e2e/gcp/crc/test/openshift-e2e-gcp-crc-test-ref.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ ref:
22
as: openshift-e2e-gcp-crc-test
33
from: libvirt-installer
44
commands: openshift-e2e-gcp-crc-test-commands.sh
5+
dependencies:
6+
- name: "release:latest"
7+
env: OPENSHIFT_INSTALL_RELEASE_IMAGE
58
resources:
69
requests:
710
cpu: 10m

‎ci-operator/step-registry/openshift/e2e/ovirt/minimal/test/openshift-e2e-ovirt-minimal-test-commands.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ fi
121121
function upgrade() {
122122
set -x
123123
openshift-tests run-upgrade all \
124-
--to-image "${OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE}" \
124+
--to-image "${OPENSHIFT_UPGRADE_RELEASE_IMAGE}" \
125125
--options "${TEST_UPGRADE_OPTIONS-}" \
126126
--provider "${TEST_PROVIDER}" \
127127
-o "${ARTIFACT_DIR}/e2e.log" \

‎ci-operator/step-registry/openshift/e2e/ovirt/minimal/test/openshift-e2e-ovirt-minimal-test-ref.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ref:
1616
suite to verify the cluster is still functional. This is typically used for testing
1717
disruption from one suite, then confirming that the disruption did not degrade the
1818
product.
19-
* 'upgrade' - Perform an upgrade to the image defined by OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE.
19+
* 'upgrade' - Perform an upgrade to the image defined by OPENSHIFT_UPGRADE_RELEASE_IMAGE.
2020
The TEST_UPGRADE_OPTIONS flag may be optionally set. All product components
2121
must run the default upgrade test (verify an upgrade completes) on pull requests
2222
prior to merge.
@@ -45,7 +45,7 @@ ref:
4545
details. The file must be present in ${SHARED_DIR}.
4646
dependencies:
4747
- name: "release:latest"
48-
env: OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE
48+
env: OPENSHIFT_UPGRADE_RELEASE_IMAGE
4949
resources:
5050
requests:
5151
cpu: "3"

‎ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ fi
121121
function upgrade() {
122122
set -x
123123
openshift-tests run-upgrade all \
124-
--to-image "${OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE}" \
124+
--to-image "${OPENSHIFT_UPGRADE_RELEASE_IMAGE}" \
125125
--options "${TEST_UPGRADE_OPTIONS-}" \
126126
--provider "${TEST_PROVIDER}" \
127127
-o "${ARTIFACT_DIR}/e2e.log" \

‎ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-ref.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ ref:
33
from: tests
44
commands: openshift-e2e-test-commands.sh
55
timeout: 10800s
6+
dependencies:
7+
- name: "release:latest"
8+
env: OPENSHIFT_UPGRADE_RELEASE_IMAGE
69
env:
710
- name: TEST_TYPE
811
default: "suite"
@@ -16,7 +19,7 @@ ref:
1619
suite to verify the cluster is still functional. This is typically used for testing
1720
disruption from one suite, then confirming that the disruption did not degrade the
1821
product.
19-
* 'upgrade' - Perform an upgrade to the image defined by OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE.
22+
* 'upgrade' - Perform an upgrade to the image defined by OPENSHIFT_UPGRADE_RELEASE_IMAGE.
2023
The TEST_UPGRADE_OPTIONS flag may be optionally set. All product components
2124
must run the default upgrade test (verify an upgrade completes) on pull requests
2225
prior to merge.
@@ -49,9 +52,6 @@ ref:
4952
Name of the CSI driver manifest file to use. Used by the `openshift-tests`
5053
program as TEST_CSI_DRIVER_FILES env. var., see its documentation for
5154
details. The file must be present in ${SHARED_DIR}.
52-
dependencies:
53-
- name: "release:latest"
54-
env: OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE
5555
resources:
5656
requests:
5757
cpu: "3"

‎ci-operator/step-registry/openshift/upgrade/aws/openshift-upgrade-aws-workflow.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ workflow:
1111
- ref: openshift-e2e-test-capabilities-check
1212
- chain: ipi-aws-post
1313
dependencies:
14-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
15-
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
14+
OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
1615
env:
1716
TEST_TYPE: upgrade
1817
TEST_SUITE: ""

‎ci-operator/step-registry/openshift/upgrade/aws/ovn/openshift-upgrade-aws-ovn-workflow.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ workflow:
1515
- chain: gather-core-dump
1616
- chain: ipi-aws-post
1717
dependencies:
18-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
19-
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
18+
OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
19+
OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
2020
env:
2121
TEST_TYPE: upgrade
2222
TEST_SUITE: ""

‎ci-operator/step-registry/openshift/upgrade/azure/openshift-upgrade-azure-workflow.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ workflow:
1010
post:
1111
- chain: ipi-azure-post
1212
dependencies:
13-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
14-
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
13+
OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
1514
env:
1615
TEST_TYPE: upgrade
1716
TEST_SUITE: ""

‎ci-operator/step-registry/openshift/upgrade/azure/ovn/openshift-upgrade-azure-ovn-workflow.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ workflow:
1414
- chain: gather-core-dump
1515
- chain: ipi-azure-post
1616
dependencies:
17-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
18-
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
17+
OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
18+
OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
1919
env:
2020
TEST_TYPE: upgrade
2121
TEST_SUITE: ""

‎ci-operator/step-registry/openshift/upgrade/gcp/openshift-upgrade-gcp-workflow.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ workflow:
1010
post:
1111
- chain: ipi-gcp-post
1212
dependencies:
13-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
14-
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
13+
OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
14+
OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
1515
env:
1616
TEST_TYPE: upgrade
1717
TEST_SUITE: ""

‎ci-operator/step-registry/openshift/upgrade/gcp/ovn/openshift-upgrade-gcp-ovn-workflow.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ workflow:
1313
- chain: gather-network
1414
- chain: ipi-gcp-post
1515
dependencies:
16-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
17-
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
16+
OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
17+
OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
1818
env:
1919
TEST_TYPE: upgrade
2020
TEST_SUITE: ""

‎ci-operator/step-registry/openshift/upgrade/openstack/loki/openshift-upgrade-openstack-loki-workflow.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ workflow:
1010
post:
1111
- chain: ipi-openstack-post
1212
dependencies:
13-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
14-
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
13+
OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
14+
OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
1515
env:
1616
TEST_TYPE: upgrade
1717
TEST_SUITE: ""

‎ci-operator/step-registry/openshift/upgrade/ovirt/openshift-upgrade-ovirt-workflow.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ workflow:
1212
TEST_TYPE: upgrade
1313
TEST_UPGRADE_OPTIONS: ""
1414
dependencies:
15-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
16-
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
15+
OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
16+
OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
1717
documentation: |-
1818
The Openshift E2E oVirt upgrade workflow installs OpenShift cluster on top of oVirt
1919
and executes an upgrade to the next available version.

‎ci-operator/step-registry/openshift/upgrade/ovirt/without-csi/openshift-upgrade-ovirt-without-csi-workflow.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ workflow:
1212
TEST_TYPE: upgrade
1313
TEST_UPGRADE_OPTIONS: ""
1414
dependencies:
15-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial"
16-
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest"
15+
OPENSHIFT_INSTALL_RELEASE_IMAGE: "release:initial"
16+
OPENSHIFT_UPGRADE_RELEASE_IMAGE: "release:latest"
1717
documentation: |-
1818
The Openshift E2E oVirt upgrade without csi workflow installs OpenShift cluster on top of oVirt
1919
from releases that didn't contain the oVirt csi driver, therfor patch the image registry.

0 commit comments

Comments
 (0)