diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.10.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.10.yaml index 88001e0c5bac6..ce462f6394f52 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.10.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.10.yaml @@ -123,61 +123,77 @@ tests: - as: e2e-azure interval: 24h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure - as: e2e-azure-techpreview interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-techpreview - as: e2e-azure-compact interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com SIZE_VARIANT: compact workflow: openshift-e2e-azure - as: e2e-azure-serial interval: 24h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: e2e-azure-techpreview-serial interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-techpreview-serial - as: e2e-azure-compact-serial interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com SIZE_VARIANT: compact workflow: openshift-e2e-azure-serial - as: e2e-azure-upgrade interval: 24h steps: - cluster_profile: azure4 + cluster_profile: azure-2 env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure - as: e2e-azure-compact-upgrade interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com SIZE_VARIANT: compact TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure - as: e2e-azure-cilium interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-cilium - as: e2e-azure-ovn interval: 24h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-ovn - as: e2e-gcp interval: 24h @@ -253,7 +269,9 @@ tests: - as: e2e-azure-upgrade-single-node interval: 24h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-upgrade-azure-single-node - as: e2e-aws-hypershift interval: 24h diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.6.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.6.yaml index ad28d6a83319e..72dcc493f001e 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.6.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.6.yaml @@ -39,7 +39,9 @@ tests: - as: e2e-azure-upgrade interval: 72h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-upgrade-azure - as: e2e-aws interval: 48h @@ -85,12 +87,16 @@ tests: - as: e2e-azure interval: 12h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure - as: e2e-azure-ovn interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-ovn - as: e2e-openstack-parallel interval: 48h diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.7.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.7.yaml index 45e64f05b37a0..fc3bce129d54e 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.7.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.7.yaml @@ -65,7 +65,9 @@ tests: - as: e2e-azure-upgrade interval: 72h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-upgrade-azure - as: e2e-aws interval: 48h @@ -92,12 +94,16 @@ tests: - as: e2e-azure interval: 12h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure - as: e2e-azure-ovn interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-ovn - as: e2e-openstack-parallel interval: 48h diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.8.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.8.yaml index b7b3660858c6e..8a7584f9a5c33 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.8.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.8.yaml @@ -108,51 +108,63 @@ tests: - as: e2e-azure interval: 24h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure - as: e2e-azure-ovn interval: 24h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-ovn - as: e2e-azure-compact interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com SIZE_VARIANT: compact workflow: openshift-e2e-azure - as: e2e-azure-serial interval: 24h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: e2e-azure-compact-serial interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com SIZE_VARIANT: compact workflow: openshift-e2e-azure-serial - as: e2e-azure-upgrade interval: 24h steps: - cluster_profile: azure4 + cluster_profile: azure-2 env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure - as: e2e-azure-compact-upgrade interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com SIZE_VARIANT: compact TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure - as: e2e-azure-cilium interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-cilium - as: e2e-gcp interval: 24h @@ -217,7 +229,9 @@ tests: - as: e2e-azure-upgrade-single-node interval: 24h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-upgrade-azure-single-node - as: e2e-aws-hypershift interval: 24h diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.9.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.9.yaml index 2ace21e0b3710..b155bb7e9bcb7 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.9.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.9.yaml @@ -123,61 +123,77 @@ tests: - as: e2e-azure interval: 24h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure - as: e2e-azure-techpreview interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-techpreview - as: e2e-azure-compact interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com SIZE_VARIANT: compact workflow: openshift-e2e-azure - as: e2e-azure-serial interval: 24h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: e2e-azure-techpreview-serial interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-techpreview-serial - as: e2e-azure-compact-serial interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com SIZE_VARIANT: compact workflow: openshift-e2e-azure-serial - as: e2e-azure-upgrade interval: 24h steps: - cluster_profile: azure4 + cluster_profile: azure-2 env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure - as: e2e-azure-compact-upgrade interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com SIZE_VARIANT: compact TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure - as: e2e-azure-cilium interval: 48h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-cilium - as: e2e-azure-ovn interval: 24h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-ovn - as: e2e-gcp interval: 24h @@ -243,7 +259,9 @@ tests: - as: e2e-azure-upgrade-single-node interval: 24h steps: - cluster_profile: azure4 + cluster_profile: azure-2 + env: + BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-upgrade-azure-single-node - as: e2e-aws-hypershift interval: 24h diff --git a/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml index 7e643379fbf7b..c8567173690d8 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml @@ -1418,7 +1418,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -1493,7 +1493,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -1568,7 +1568,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -1643,7 +1643,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -1718,7 +1718,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -1793,7 +1793,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -1868,7 +1868,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -1943,7 +1943,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -2018,7 +2018,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -2093,7 +2093,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -2168,7 +2168,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -7690,7 +7690,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -7765,7 +7765,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -7840,7 +7840,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -9577,7 +9577,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -9652,7 +9652,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -9727,7 +9727,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -12222,7 +12222,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -12297,7 +12297,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -12372,7 +12372,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -12447,7 +12447,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -12522,7 +12522,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -12597,7 +12597,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -12672,7 +12672,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -12747,7 +12747,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -12822,7 +12822,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -16085,7 +16085,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -16160,7 +16160,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -16235,7 +16235,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -16310,7 +16310,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -16385,7 +16385,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -16460,7 +16460,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -16535,7 +16535,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -16610,7 +16610,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -16685,7 +16685,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -16760,7 +16760,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials @@ -16844,7 +16844,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-azure-2 - name: pull-secret secret: secretName: registry-pull-credentials