diff --git a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-main.yaml b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-main.yaml index 79944ae004bd5..eeb66a5fa5826 100644 --- a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-main.yaml +++ b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-main.yaml @@ -68,8 +68,6 @@ tests: shard_count: 2 steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: unit commands: make test diff --git a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.18.yaml b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.18.yaml index 1085e167c4267..936e25d679dd8 100644 --- a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.18.yaml +++ b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.18.yaml @@ -59,8 +59,6 @@ tests: - as: e2e-azure-serial steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: unit commands: make test diff --git a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.19.yaml b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.19.yaml index bfcaf30813d99..e9076c463e280 100644 --- a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.19.yaml +++ b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.19.yaml @@ -68,8 +68,6 @@ tests: shard_count: 2 steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: unit commands: make test diff --git a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.20.yaml b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.20.yaml index bf17d07cf9a50..2a70afe131bcf 100644 --- a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.20.yaml +++ b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.20.yaml @@ -68,8 +68,6 @@ tests: shard_count: 2 steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: unit commands: make test diff --git a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.21.yaml b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.21.yaml index e14cf23950990..e3e994e7e0b4d 100644 --- a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.21.yaml +++ b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.21.yaml @@ -69,8 +69,6 @@ tests: shard_count: 2 steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: unit commands: make test diff --git a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.22.yaml b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.22.yaml index f4f761758d8e1..fcab3610433a0 100644 --- a/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.22.yaml +++ b/ci-operator/config/openshift-priv/cloud-network-config-controller/openshift-priv-cloud-network-config-controller-release-4.22.yaml @@ -68,8 +68,6 @@ tests: shard_count: 2 steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: unit commands: make test diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master.yaml index 54c9f0e1ede44..1495f993af2b9 100644 --- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master.yaml +++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master.yaml @@ -210,7 +210,6 @@ tests: steps: cluster_profile: azure4 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.12.yaml index d99133633f4da..49fb16f7b0867 100644 --- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.12.yaml @@ -136,7 +136,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.16.yaml index 5769f17cd5f94..6423ede0b609a 100644 --- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.16.yaml +++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.16.yaml @@ -186,7 +186,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.17.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.17.yaml index bbb2d9c678f57..ef2420063f57d 100644 --- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.17.yaml +++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.17.yaml @@ -179,7 +179,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.18.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.18.yaml index 089ecc4ea0466..b34c92e9a0b77 100644 --- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.18.yaml +++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.18.yaml @@ -207,7 +207,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com EXTRA_MG_ARGS: --host-network FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.19.yaml index 06558c7211461..fbc6ab21175da 100644 --- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.19.yaml +++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.19.yaml @@ -209,7 +209,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.20.yaml index 180ca8dfa7eca..d7348439ede06 100644 --- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.20.yaml +++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.20.yaml @@ -209,7 +209,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.21.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.21.yaml index 8b4fb1ee1a0df..386a5beb3eb11 100644 --- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.21.yaml +++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.21.yaml @@ -211,7 +211,6 @@ tests: steps: cluster_profile: azure4 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.22.yaml b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.22.yaml index 4d38baf6399a7..dc1471c58858a 100644 --- a/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.22.yaml +++ b/ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.22.yaml @@ -210,7 +210,6 @@ tests: steps: cluster_profile: azure4 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-main.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-main.yaml index 38fb62b944cf7..954d25977c162 100644 --- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-main.yaml +++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-main.yaml @@ -175,7 +175,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-azure-ovn-upgrade-out-of-change @@ -187,7 +186,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.10.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.10.yaml index 6a5479e8252b0..2b5f921ef5cd4 100644 --- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.10.yaml +++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.10.yaml @@ -87,7 +87,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-aws-serial diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.11.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.11.yaml index 16793cbc34e3b..a4d05e375a007 100644 --- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.11.yaml @@ -81,7 +81,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-aws-serial diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.12.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.12.yaml index 1dc8aebdf8f32..2e5e95f24723d 100644 --- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.12.yaml @@ -89,7 +89,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.13.yaml index 3c4f4bb1cd7bf..a18eb96a7f6b3 100644 --- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.13.yaml @@ -152,7 +152,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.14.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.14.yaml index 70d507b7e3b4a..3c9c455e037be 100644 --- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.14.yaml +++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.14.yaml @@ -152,7 +152,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.15.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.15.yaml index 1d0f0261d0902..368cd748c4326 100644 --- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.15.yaml +++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.15.yaml @@ -154,7 +154,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.16.yaml index 9af11440212f6..f401e788703f2 100644 --- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.16.yaml +++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.16.yaml @@ -148,7 +148,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-azure-ovn-upgrade-out-of-change @@ -160,7 +159,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.17.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.17.yaml index 561dc246a9a0d..befd4ad3eda20 100644 --- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.17.yaml +++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.17.yaml @@ -148,7 +148,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-azure-ovn-upgrade-out-of-change @@ -160,7 +159,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.18.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.18.yaml index 0bffb1df61cd2..a72fbc18dce0c 100644 --- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.18.yaml +++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.18.yaml @@ -148,7 +148,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-azure-ovn-upgrade-out-of-change @@ -160,7 +159,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.19.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.19.yaml index 932309d895f45..3906c1b4e1686 100644 --- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.19.yaml +++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.19.yaml @@ -161,7 +161,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-azure-ovn-upgrade-out-of-change @@ -173,7 +172,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.20.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.20.yaml index 0e0c13833df6d..e1bd07abccabd 100644 --- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.20.yaml +++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.20.yaml @@ -175,7 +175,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-azure-ovn-upgrade-out-of-change @@ -187,7 +186,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.21.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.21.yaml index 0199d634dedf4..2fcff79373187 100644 --- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.21.yaml +++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.21.yaml @@ -176,7 +176,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-azure-ovn-upgrade-out-of-change @@ -188,7 +187,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.22.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.22.yaml index 31f6ff0c521fd..a4200907b728e 100644 --- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.22.yaml +++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.22.yaml @@ -175,7 +175,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-azure-ovn-upgrade-out-of-change @@ -187,7 +186,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-main.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-main.yaml index 6676186966c82..64cf1438f6449 100644 --- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-main.yaml +++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-main.yaml @@ -166,7 +166,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.16.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.16.yaml index 032e8e944f968..f5e0d93b67b49 100644 --- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.16.yaml +++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.16.yaml @@ -141,7 +141,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.17.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.17.yaml index 17589bc1f4d4e..f416b8227db47 100644 --- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.17.yaml +++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.17.yaml @@ -145,7 +145,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.18.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.18.yaml index 0ca531c74cec8..7af90f8d6b12e 100644 --- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.18.yaml +++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.18.yaml @@ -175,7 +175,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.19.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.19.yaml index edc38966fc447..16742bfc40ee4 100644 --- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.19.yaml +++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.19.yaml @@ -175,7 +175,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.20.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.20.yaml index 8173b7addcfb0..0918cbb2da7d8 100644 --- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.20.yaml +++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.20.yaml @@ -163,7 +163,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.21.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.21.yaml index 5cc9231c04bd0..178737fade110 100644 --- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.21.yaml +++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.21.yaml @@ -167,7 +167,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.22.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.22.yaml index e5756c04d10ea..647b0e1454ae6 100644 --- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.22.yaml +++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.22.yaml @@ -166,7 +166,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-master.yaml b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-master.yaml index 70b572f20b0e3..475da44645da9 100644 --- a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-master.yaml +++ b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-master.yaml @@ -219,7 +219,6 @@ tests: steps: cluster_profile: azure4 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com EXTRA_MG_ARGS: --host-network FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.15.yaml b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.15.yaml index 260ca56408197..563a3e7f8ded0 100644 --- a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.15.yaml +++ b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.15.yaml @@ -146,7 +146,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.16.yaml b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.16.yaml index aa32bc33bd42a..cc7177836e601 100644 --- a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.16.yaml +++ b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.16.yaml @@ -177,7 +177,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.17.yaml b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.17.yaml index 4e3fb7bdc1ec9..f9a72a860da0c 100644 --- a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.17.yaml +++ b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.17.yaml @@ -177,7 +177,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.18.yaml b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.18.yaml index 3f4d0109bca74..255af509744b9 100644 --- a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.18.yaml +++ b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.18.yaml @@ -202,7 +202,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com EXTRA_MG_ARGS: --host-network FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.19.yaml b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.19.yaml index be3ca5c5e5db9..337a5425a529c 100644 --- a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.19.yaml +++ b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.19.yaml @@ -217,7 +217,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com EXTRA_MG_ARGS: --host-network FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.20.yaml b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.20.yaml index 830b1b323bc51..7c5b8e4a6de37 100644 --- a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.20.yaml +++ b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.20.yaml @@ -219,7 +219,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com EXTRA_MG_ARGS: --host-network FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.21.yaml b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.21.yaml index 1e600562c11ca..bc5c1f203e5c4 100644 --- a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.21.yaml +++ b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.21.yaml @@ -220,7 +220,6 @@ tests: steps: cluster_profile: azure4 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com EXTRA_MG_ARGS: --host-network FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.22.yaml b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.22.yaml index a96097e8d18c5..df184b6c6c665 100644 --- a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.22.yaml +++ b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-release-4.22.yaml @@ -219,7 +219,6 @@ tests: steps: cluster_profile: azure4 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com EXTRA_MG_ARGS: --host-network FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-sandbox-release-4.16.yaml b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-sandbox-release-4.16.yaml index bd3d8ee083793..ae8db33394159 100644 --- a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-sandbox-release-4.16.yaml +++ b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-sandbox-release-4.16.yaml @@ -161,7 +161,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-sandbox-release-4.17.yaml b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-sandbox-release-4.17.yaml index cf50fe726bb1e..3dfe43336fe26 100644 --- a/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-sandbox-release-4.17.yaml +++ b/ci-operator/config/openshift-priv/ovn-kubernetes/openshift-priv-ovn-kubernetes-sandbox-release-4.17.yaml @@ -162,7 +162,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift-priv/secrets-store-csi-driver-operator/openshift-priv-secrets-store-csi-driver-operator-main.yaml b/ci-operator/config/openshift-priv/secrets-store-csi-driver-operator/openshift-priv-secrets-store-csi-driver-operator-main.yaml index 1472007cf8a79..04616c0b282ac 100644 --- a/ci-operator/config/openshift-priv/secrets-store-csi-driver-operator/openshift-priv-secrets-store-csi-driver-operator-main.yaml +++ b/ci-operator/config/openshift-priv/secrets-store-csi-driver-operator/openshift-priv-secrets-store-csi-driver-operator-main.yaml @@ -170,7 +170,6 @@ tests: OO_INDEX: ci-index-secrets-store-csi-driver-operator-bundle SECRETS_STORE_E2E_PROVIDER_IMAGE: secrets-store-csi-driver-e2eprovider env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers OO_PACKAGE: secrets-store-csi-driver-operator diff --git a/ci-operator/config/openshift-priv/secrets-store-csi-driver-operator/openshift-priv-secrets-store-csi-driver-operator-release-4.20.yaml b/ci-operator/config/openshift-priv/secrets-store-csi-driver-operator/openshift-priv-secrets-store-csi-driver-operator-release-4.20.yaml index 77a49867b0be2..ac401f394e10b 100644 --- a/ci-operator/config/openshift-priv/secrets-store-csi-driver-operator/openshift-priv-secrets-store-csi-driver-operator-release-4.20.yaml +++ b/ci-operator/config/openshift-priv/secrets-store-csi-driver-operator/openshift-priv-secrets-store-csi-driver-operator-release-4.20.yaml @@ -170,7 +170,6 @@ tests: OO_INDEX: ci-index-secrets-store-csi-driver-operator-bundle SECRETS_STORE_E2E_PROVIDER_IMAGE: secrets-store-csi-driver-e2eprovider env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers OO_PACKAGE: secrets-store-csi-driver-operator diff --git a/ci-operator/config/openshift-priv/secrets-store-csi-driver-operator/openshift-priv-secrets-store-csi-driver-operator-release-4.21.yaml b/ci-operator/config/openshift-priv/secrets-store-csi-driver-operator/openshift-priv-secrets-store-csi-driver-operator-release-4.21.yaml index 479cb0bc30a4a..d2deee82a1735 100644 --- a/ci-operator/config/openshift-priv/secrets-store-csi-driver-operator/openshift-priv-secrets-store-csi-driver-operator-release-4.21.yaml +++ b/ci-operator/config/openshift-priv/secrets-store-csi-driver-operator/openshift-priv-secrets-store-csi-driver-operator-release-4.21.yaml @@ -171,7 +171,6 @@ tests: OO_INDEX: ci-index-secrets-store-csi-driver-operator-bundle SECRETS_STORE_E2E_PROVIDER_IMAGE: secrets-store-csi-driver-e2eprovider env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers OO_PACKAGE: secrets-store-csi-driver-operator diff --git a/ci-operator/config/openshift-priv/secrets-store-csi-driver-operator/openshift-priv-secrets-store-csi-driver-operator-release-4.22.yaml b/ci-operator/config/openshift-priv/secrets-store-csi-driver-operator/openshift-priv-secrets-store-csi-driver-operator-release-4.22.yaml index 7ee934f996ae1..e53d02f63e485 100644 --- a/ci-operator/config/openshift-priv/secrets-store-csi-driver-operator/openshift-priv-secrets-store-csi-driver-operator-release-4.22.yaml +++ b/ci-operator/config/openshift-priv/secrets-store-csi-driver-operator/openshift-priv-secrets-store-csi-driver-operator-release-4.22.yaml @@ -170,7 +170,6 @@ tests: OO_INDEX: ci-index-secrets-store-csi-driver-operator-bundle SECRETS_STORE_E2E_PROVIDER_IMAGE: secrets-store-csi-driver-e2eprovider env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers OO_PACKAGE: secrets-store-csi-driver-operator diff --git a/ci-operator/config/openshift-priv/secrets-store-csi-driver/openshift-priv-secrets-store-csi-driver-main.yaml b/ci-operator/config/openshift-priv/secrets-store-csi-driver/openshift-priv-secrets-store-csi-driver-main.yaml index cf37554b26e61..cd16b6063cfd6 100644 --- a/ci-operator/config/openshift-priv/secrets-store-csi-driver/openshift-priv-secrets-store-csi-driver-main.yaml +++ b/ci-operator/config/openshift-priv/secrets-store-csi-driver/openshift-priv-secrets-store-csi-driver-main.yaml @@ -114,8 +114,6 @@ tests: cluster_profile: azure-2 dependencies: SECRETS_STORE_CSI_DRIVER_IMAGE: secrets-store-csi-driver - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-csi-secrets-store-azure-operand - as: e2e-gcp steps: diff --git a/ci-operator/config/openshift-priv/secrets-store-csi-driver/openshift-priv-secrets-store-csi-driver-release-4.20.yaml b/ci-operator/config/openshift-priv/secrets-store-csi-driver/openshift-priv-secrets-store-csi-driver-release-4.20.yaml index 6cff8cc17d4e1..93463b77569d3 100644 --- a/ci-operator/config/openshift-priv/secrets-store-csi-driver/openshift-priv-secrets-store-csi-driver-release-4.20.yaml +++ b/ci-operator/config/openshift-priv/secrets-store-csi-driver/openshift-priv-secrets-store-csi-driver-release-4.20.yaml @@ -100,8 +100,6 @@ tests: cluster_profile: azure-2 dependencies: SECRETS_STORE_CSI_DRIVER_IMAGE: secrets-store-csi-driver - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-csi-secrets-store-azure-operand - as: e2e-gcp steps: diff --git a/ci-operator/config/openshift-priv/secrets-store-csi-driver/openshift-priv-secrets-store-csi-driver-release-4.21.yaml b/ci-operator/config/openshift-priv/secrets-store-csi-driver/openshift-priv-secrets-store-csi-driver-release-4.21.yaml index 261157e650e34..785210e681d65 100644 --- a/ci-operator/config/openshift-priv/secrets-store-csi-driver/openshift-priv-secrets-store-csi-driver-release-4.21.yaml +++ b/ci-operator/config/openshift-priv/secrets-store-csi-driver/openshift-priv-secrets-store-csi-driver-release-4.21.yaml @@ -115,8 +115,6 @@ tests: cluster_profile: azure-2 dependencies: SECRETS_STORE_CSI_DRIVER_IMAGE: secrets-store-csi-driver - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-csi-secrets-store-azure-operand - as: e2e-gcp steps: diff --git a/ci-operator/config/openshift-priv/secrets-store-csi-driver/openshift-priv-secrets-store-csi-driver-release-4.22.yaml b/ci-operator/config/openshift-priv/secrets-store-csi-driver/openshift-priv-secrets-store-csi-driver-release-4.22.yaml index 57657018bece8..b8198a4ff2f0d 100644 --- a/ci-operator/config/openshift-priv/secrets-store-csi-driver/openshift-priv-secrets-store-csi-driver-release-4.22.yaml +++ b/ci-operator/config/openshift-priv/secrets-store-csi-driver/openshift-priv-secrets-store-csi-driver-release-4.22.yaml @@ -114,8 +114,6 @@ tests: cluster_profile: azure-2 dependencies: SECRETS_STORE_CSI_DRIVER_IMAGE: secrets-store-csi-driver - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-csi-secrets-store-azure-operand - as: e2e-gcp steps: diff --git a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-main.yaml b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-main.yaml index f083da1ed6c8b..4871c62738d71 100644 --- a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-main.yaml +++ b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-main.yaml @@ -68,8 +68,6 @@ tests: shard_count: 2 steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: unit commands: make test diff --git a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.18.yaml b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.18.yaml index 2ba795d36b7f4..bdaed1df12c8a 100644 --- a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.18.yaml +++ b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.18.yaml @@ -59,8 +59,6 @@ tests: - as: e2e-azure-serial steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: unit commands: make test diff --git a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.19.yaml b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.19.yaml index 954e339413829..563919a073353 100644 --- a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.19.yaml +++ b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.19.yaml @@ -68,8 +68,6 @@ tests: shard_count: 2 steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: unit commands: make test diff --git a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.20.yaml b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.20.yaml index 67621dfd66c1c..94486cb233f94 100644 --- a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.20.yaml +++ b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.20.yaml @@ -68,8 +68,6 @@ tests: shard_count: 2 steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: unit commands: make test diff --git a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.21.yaml b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.21.yaml index c5360a7d4d7ad..d39a174d4be40 100644 --- a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.21.yaml +++ b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.21.yaml @@ -69,8 +69,6 @@ tests: shard_count: 2 steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: unit commands: make test diff --git a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.22.yaml b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.22.yaml index ff1c38f5f83a7..293b300772c13 100644 --- a/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.22.yaml +++ b/ci-operator/config/openshift/cloud-network-config-controller/openshift-cloud-network-config-controller-release-4.22.yaml @@ -68,8 +68,6 @@ tests: shard_count: 2 steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: unit commands: make test diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml index 6b13ab3e0d5d0..c9f9b44947dbb 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml @@ -209,7 +209,6 @@ tests: steps: cluster_profile: azure4 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.12.yaml index 3df08b170b014..cf178371d1c42 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.12.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.12.yaml @@ -135,7 +135,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.16.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.16.yaml index 2226dbcfc0b05..0283679b97168 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.16.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.16.yaml @@ -185,7 +185,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.17.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.17.yaml index 80bf77ec3e6ee..6e10cbf1ca43d 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.17.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.17.yaml @@ -178,7 +178,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.18.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.18.yaml index d7120c97b701f..0fcdddb65b2fe 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.18.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.18.yaml @@ -206,7 +206,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com EXTRA_MG_ARGS: --host-network FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.19.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.19.yaml index 4953b20f7691c..0cc028e79e683 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.19.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.19.yaml @@ -208,7 +208,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.20.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.20.yaml index 65e12eb8deaa8..a7350918ea208 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.20.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.20.yaml @@ -208,7 +208,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.21.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.21.yaml index ef5d6b145ce86..8d3a3517236dc 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.21.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.21.yaml @@ -210,7 +210,6 @@ tests: steps: cluster_profile: azure4 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.22.yaml b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.22.yaml index cbbe628a2ea5c..447ae0f182b0b 100644 --- a/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.22.yaml +++ b/ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.22.yaml @@ -209,7 +209,6 @@ tests: steps: cluster_profile: azure4 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml index 64e797bec6513..2755374a05baf 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml @@ -174,7 +174,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-azure-ovn-upgrade-out-of-change @@ -186,7 +185,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10.yaml index 99ab301dae8de..121a4d07d3f3f 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10.yaml @@ -86,7 +86,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-aws-serial diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.11.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.11.yaml index e0a8ba8c26540..6c77861969443 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.11.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.11.yaml @@ -80,7 +80,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-aws-serial diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.12.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.12.yaml index 23655e4614404..3cba69d825ca7 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.12.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.12.yaml @@ -88,7 +88,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.13.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.13.yaml index 4acf40c67856e..9fec4349a924a 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.13.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.13.yaml @@ -151,7 +151,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.14.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.14.yaml index a497903007c7f..51eb8510ae8c0 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.14.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.14.yaml @@ -151,7 +151,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.15.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.15.yaml index a728ca8c9cb7c..211aad9f09b0d 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.15.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.15.yaml @@ -153,7 +153,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.16.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.16.yaml index d9cc28c2a20a9..11dfec7254e0d 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.16.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.16.yaml @@ -147,7 +147,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-azure-ovn-upgrade-out-of-change @@ -159,7 +158,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.17.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.17.yaml index 6160a2dc84d89..efd55b2b28970 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.17.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.17.yaml @@ -147,7 +147,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-azure-ovn-upgrade-out-of-change @@ -159,7 +158,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.18.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.18.yaml index 6f6217c9c95ea..5fc5d947fb7bf 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.18.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.18.yaml @@ -147,7 +147,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-azure-ovn-upgrade-out-of-change @@ -159,7 +158,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.19.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.19.yaml index 1ce9e6046b9b0..bff5dc7607411 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.19.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.19.yaml @@ -160,7 +160,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-azure-ovn-upgrade-out-of-change @@ -172,7 +171,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.20.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.20.yaml index 2255da367fcb7..6f564afa3ec4e 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.20.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.20.yaml @@ -174,7 +174,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-azure-ovn-upgrade-out-of-change @@ -186,7 +185,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.21.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.21.yaml index 8eb1c54019648..3a80bb9d5c8e0 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.21.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.21.yaml @@ -175,7 +175,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-azure-ovn-upgrade-out-of-change @@ -187,7 +186,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22.yaml index b1e87215c95a0..09bd9e3dfa01a 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22.yaml @@ -174,7 +174,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - as: e2e-azure-ovn-upgrade-out-of-change @@ -186,7 +185,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn - always_run: false diff --git a/ci-operator/config/openshift/origin/openshift-origin-main.yaml b/ci-operator/config/openshift/origin/openshift-origin-main.yaml index 4d4685d605073..49f6491e07db8 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-main.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-main.yaml @@ -165,7 +165,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.16.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.16.yaml index 37046b704fe53..de1bca2ba1eae 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.16.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.16.yaml @@ -140,7 +140,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.17.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.17.yaml index 7795d0339f3a0..1871d61ffcb5b 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.17.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.17.yaml @@ -144,7 +144,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.18.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.18.yaml index ecb89fc2adfdb..9fef09fef4585 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.18.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.18.yaml @@ -174,7 +174,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.19.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.19.yaml index 7092e8f162593..aefe10367fdfa 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.19.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.19.yaml @@ -174,7 +174,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.20.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.20.yaml index 6368844effae9..f035899f68fc6 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.20.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.20.yaml @@ -162,7 +162,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.21.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.21.yaml index 89125680a4c03..d31f5da36c061 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.21.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.21.yaml @@ -166,7 +166,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.22.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.22.yaml index 747b0f366bab6..0f0b031f95215 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.22.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.22.yaml @@ -165,7 +165,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml index 4acb864ab5c21..efc8ec74424a2 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master.yaml @@ -218,7 +218,6 @@ tests: steps: cluster_profile: azure4 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com EXTRA_MG_ARGS: --host-network FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.15.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.15.yaml index 1a14763e5cbbb..df4cf0b58bb17 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.15.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.15.yaml @@ -145,7 +145,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.16.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.16.yaml index e185371425377..a4e3ac4ca89aa 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.16.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.16.yaml @@ -176,7 +176,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.17.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.17.yaml index a7250b1bf7b99..a38b91d4b5fc8 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.17.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.17.yaml @@ -176,7 +176,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.18.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.18.yaml index 207a88eca25f9..be7d9fe2c1eef 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.18.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.18.yaml @@ -201,7 +201,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com EXTRA_MG_ARGS: --host-network FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.19.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.19.yaml index 977c2c2bf19d6..8d59d7db07c2c 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.19.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.19.yaml @@ -216,7 +216,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com EXTRA_MG_ARGS: --host-network FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.20.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.20.yaml index d185e198c95d7..4e137a0718325 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.20.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.20.yaml @@ -218,7 +218,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com EXTRA_MG_ARGS: --host-network FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.21.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.21.yaml index a0e8f7523d0ff..117d09352f359 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.21.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.21.yaml @@ -219,7 +219,6 @@ tests: steps: cluster_profile: azure4 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com EXTRA_MG_ARGS: --host-network FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.22.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.22.yaml index 3b3e36c10b884..39b395c61ba86 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.22.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.22.yaml @@ -218,7 +218,6 @@ tests: steps: cluster_profile: azure4 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com EXTRA_MG_ARGS: --host-network FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-sandbox-release-4.16.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-sandbox-release-4.16.yaml index 2d8bc9d30cba1..48f777965212e 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-sandbox-release-4.16.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-sandbox-release-4.16.yaml @@ -160,7 +160,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-sandbox-release-4.17.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-sandbox-release-4.17.yaml index e48b7b3432ff9..0a318fca30d03 100644 --- a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-sandbox-release-4.17.yaml +++ b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-sandbox-release-4.17.yaml @@ -161,7 +161,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.10-upgrade-from-stable-4.9.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.10-upgrade-from-stable-4.9.yaml index 795a3903a0432..e13dbb0370a29 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.10-upgrade-from-stable-4.9.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.10-upgrade-from-stable-4.9.yaml @@ -81,7 +81,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn timeout: 5h30m0s 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 d6fec996b9a4d..a291e07afc689 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 @@ -72,36 +72,27 @@ tests: cron: 56 2 6 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure - as: e2e-azure-techpreview cron: 7 1 5 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-techpreview - as: e2e-azure-serial cron: 26 2 8 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: e2e-azure-techpreview-serial cron: 17 7 10 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-techpreview-serial - as: e2e-azure-upgrade cron: 14 4 7 */12 * steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure - as: e2e-azure-ovn-upgrade @@ -109,7 +100,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn timeout: 5h30m0s @@ -117,15 +107,11 @@ tests: cron: 58 1 6 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-cilium - as: e2e-azure-ovn cron: 42 10 10 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-ovn - as: e2e-gcp cron: 19 5 6 */12 * diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.11-upgrade-from-stable-4.10.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.11-upgrade-from-stable-4.10.yaml index b0e47020e526a..da3d491918daf 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.11-upgrade-from-stable-4.10.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.11-upgrade-from-stable-4.10.yaml @@ -40,7 +40,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_REQUIRES_SSH: "true" TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure @@ -82,7 +81,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.11.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.11.yaml index 06aa0a8b9f7a8..9141f6959576d 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.11.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.11.yaml @@ -84,36 +84,27 @@ tests: cron: 39 8 7 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure - as: e2e-azure-techpreview cron: 29 4 7 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-techpreview - as: e2e-azure-serial cron: 40 1 5 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: e2e-azure-techpreview-serial cron: 5 2 5 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-techpreview-serial - as: e2e-azure-upgrade cron: 26 2 10 */12 * steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure - as: e2e-azure-ovn-upgrade @@ -121,7 +112,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn @@ -130,15 +120,12 @@ tests: cron: 32 5 5 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-cilium - as: e2e-azure-ovn cron: 44 10 9 */12 * steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" workflow: openshift-e2e-azure-ovn - as: e2e-gcp diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.12-upgrade-from-stable-4.11.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.12-upgrade-from-stable-4.11.yaml index 4416ec85ed74f..207fa1b16d474 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.12-upgrade-from-stable-4.11.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.12-upgrade-from-stable-4.11.yaml @@ -48,7 +48,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_REQUIRES_SSH: "true" TEST_TYPE: upgrade-conformance observers: @@ -108,7 +107,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.12.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.12.yaml index 88f3b0a997721..1fdd55fe63505 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.12.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.12.yaml @@ -121,8 +121,6 @@ tests: cron: 47 23 */13,26 * * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -132,7 +130,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -142,8 +139,6 @@ tests: cron: 20 14 */6,20 * * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -153,7 +148,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -164,7 +158,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance observers: enable: @@ -175,7 +168,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -187,8 +179,6 @@ tests: cron: 6 4 */3,16 * * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -198,7 +188,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" observers: enable: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.13-upgrade-from-stable-4.12.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.13-upgrade-from-stable-4.12.yaml index c0ea28c9d8737..520e3a1e1f437 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.13-upgrade-from-stable-4.12.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.13-upgrade-from-stable-4.12.yaml @@ -49,7 +49,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_REQUIRES_SSH: "true" TEST_TYPE: upgrade-conformance observers: @@ -119,7 +118,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.13.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.13.yaml index f4633058509d5..17c6c34ebdf37 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.13.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.13.yaml @@ -134,8 +134,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -145,7 +143,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -155,8 +152,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -166,7 +161,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -177,7 +171,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance observers: enable: @@ -188,7 +181,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -200,8 +192,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -211,7 +201,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" observers: enable: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.14-upgrade-from-stable-4.13.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.14-upgrade-from-stable-4.13.yaml index d0a473ac1564e..4686cf9fd0797 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.14-upgrade-from-stable-4.13.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.14-upgrade-from-stable-4.13.yaml @@ -49,7 +49,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_REQUIRES_SSH: "yes" TEST_TYPE: upgrade-conformance observers: @@ -128,7 +127,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.14.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.14.yaml index 93af7061826eb..cbb6f8455a678 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.14.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.14.yaml @@ -143,8 +143,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -154,7 +152,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -164,8 +161,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -174,8 +169,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -185,7 +178,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -196,7 +188,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance observers: enable: @@ -207,7 +198,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -219,8 +209,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -230,7 +218,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" observers: enable: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.15-upgrade-from-stable-4.14.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.15-upgrade-from-stable-4.14.yaml index 55e2a122fbb91..5922898bb453b 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.15-upgrade-from-stable-4.14.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.15-upgrade-from-stable-4.14.yaml @@ -49,7 +49,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_REQUIRES_SSH: "yes" TEST_TYPE: upgrade-conformance observers: @@ -129,7 +128,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.15.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.15.yaml index ac5ffd57b519b..2ebff36d4ff9c 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.15.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.15.yaml @@ -178,7 +178,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OVERRIDE_OPENSHIFT_SDN_DEPRECATION: "true" observers: enable: @@ -189,7 +188,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -199,8 +197,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -210,7 +206,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OVERRIDE_OPENSHIFT_SDN_DEPRECATION: "true" observers: enable: @@ -221,7 +216,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -232,7 +226,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OVERRIDE_OPENSHIFT_SDN_DEPRECATION: "true" TEST_TYPE: upgrade-conformance observers: @@ -247,7 +240,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OVERRIDE_OPENSHIFT_SDN_DEPRECATION: "true" TEST_TYPE: upgrade-conformance observers: @@ -259,7 +251,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -275,7 +266,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -287,8 +277,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -298,7 +286,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" observers: enable: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.16-upgrade-from-stable-4.15.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.16-upgrade-from-stable-4.15.yaml index aa27afd3e0432..214f43bcf6418 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.16-upgrade-from-stable-4.15.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.16-upgrade-from-stable-4.15.yaml @@ -51,7 +51,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OVERRIDE_OPENSHIFT_SDN_DEPRECATION: "true" TEST_REQUIRES_SSH: "yes" TEST_TYPE: upgrade-conformance @@ -124,7 +123,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.16.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.16.yaml index 880b8ff55dfb2..00f78416e5088 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.16.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.16.yaml @@ -194,7 +194,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OVERRIDE_OPENSHIFT_SDN_DEPRECATION: "true" observers: enable: @@ -205,7 +204,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -215,8 +213,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -225,8 +221,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -236,7 +230,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -247,7 +240,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OVERRIDE_OPENSHIFT_SDN_DEPRECATION: "true" TEST_TYPE: upgrade-conformance observers: @@ -262,7 +254,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OVERRIDE_OPENSHIFT_SDN_DEPRECATION: "true" TEST_TYPE: upgrade-conformance observers: @@ -274,7 +265,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -290,7 +280,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -302,8 +291,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -313,7 +300,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" observers: enable: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.17-upgrade-from-stable-4.16.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.17-upgrade-from-stable-4.16.yaml index b091bc685e5f4..a86d1ee57046f 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.17-upgrade-from-stable-4.16.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.17-upgrade-from-stable-4.16.yaml @@ -78,7 +78,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.17.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.17.yaml index 92682114ca1d5..4b90da4468bbd 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.17.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.17.yaml @@ -122,7 +122,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -132,8 +131,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -143,7 +140,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -154,7 +150,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -170,7 +165,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -182,8 +176,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -193,7 +185,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" observers: enable: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.18-upgrade-from-stable-4.17.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.18-upgrade-from-stable-4.17.yaml index 021487ec48cd0..1c53d4f3d761c 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.18-upgrade-from-stable-4.17.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.18-upgrade-from-stable-4.17.yaml @@ -90,7 +90,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -114,7 +113,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -156,7 +154,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.18.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.18.yaml index 3787fdbf98481..c8bc960a331e2 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.18.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.18.yaml @@ -132,7 +132,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -142,8 +141,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -153,7 +150,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -164,7 +160,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -180,7 +175,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -192,8 +186,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -203,7 +195,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" observers: enable: @@ -322,7 +313,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -364,7 +354,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.19-upgrade-from-stable-4.18.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.19-upgrade-from-stable-4.18.yaml index 6d0b4a66cdebd..e797e7f455411 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.19-upgrade-from-stable-4.18.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.19-upgrade-from-stable-4.18.yaml @@ -90,7 +90,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -114,7 +113,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.19.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.19.yaml index e5b6d99dad656..4e2e3a542be9b 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.19.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.19.yaml @@ -133,7 +133,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -143,8 +142,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -154,7 +151,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -166,7 +162,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -182,7 +177,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -194,8 +188,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -205,7 +197,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" observers: enable: @@ -334,7 +325,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.20-upgrade-from-stable-4.19.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.20-upgrade-from-stable-4.19.yaml index a17ab56297577..561eb04f0af90 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.20-upgrade-from-stable-4.19.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.20-upgrade-from-stable-4.19.yaml @@ -90,7 +90,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com CONTROL_PLANE_INSTANCE_TYPE: Standard_D8as_v5 FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance @@ -115,7 +114,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com CONTROL_PLANE_INSTANCE_TYPE: Standard_D8as_v5 FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.20.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.20.yaml index 6ea0c244a6e6c..fd29f4e46269d 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.20.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.20.yaml @@ -123,7 +123,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -133,8 +132,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -144,7 +141,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -156,7 +152,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -172,7 +167,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -184,8 +178,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -195,7 +187,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" observers: enable: @@ -327,7 +318,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.21-upgrade-from-stable-4.20.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.21-upgrade-from-stable-4.20.yaml index 7856b8ee7cdfa..41ef6bf7b6077 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.21-upgrade-from-stable-4.20.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.21-upgrade-from-stable-4.20.yaml @@ -90,7 +90,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com CONTROL_PLANE_INSTANCE_TYPE: Standard_D8as_v5 FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance @@ -115,7 +114,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com CONTROL_PLANE_INSTANCE_TYPE: Standard_D8as_v5 FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.21.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.21.yaml index 0009f3569bd4b..dc7a626eaaede 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.21.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.21.yaml @@ -136,7 +136,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -146,8 +145,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -157,7 +154,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FEATURE_SET: TechPreviewNoUpgrade observers: enable: @@ -169,7 +165,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -182,7 +177,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" FEATURE_SET: TechPreviewNoUpgrade TEST_TYPE: upgrade-conformance @@ -199,7 +193,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: @@ -211,8 +204,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -222,7 +213,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" observers: enable: @@ -366,7 +356,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance observers: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.6-upgrade-from-stable-4.5.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.6-upgrade-from-stable-4.5.yaml index f488a1f171613..61e39eba4c5ec 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.6-upgrade-from-stable-4.5.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.6-upgrade-from-stable-4.5.yaml @@ -42,7 +42,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com LOKI_USE_SERVICEMONITOR: "" workflow: openshift-upgrade-azure - as: e2e-vsphere-upgrade 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 2302cc707d316..ff2f41ab34fc2 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 @@ -30,8 +30,6 @@ tests: cron: 45 11 27 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-upgrade-azure - as: e2e-aws cron: 21 1 7 */12 * @@ -70,15 +68,11 @@ tests: cron: 14 3 18 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure - as: e2e-azure-ovn cron: 25 23 26 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-ovn zz_generated_metadata: branch: master diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.7-upgrade-from-stable-4.6.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.7-upgrade-from-stable-4.6.yaml index 74961bbdf11af..40dfad9a1d382 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.7-upgrade-from-stable-4.6.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.7-upgrade-from-stable-4.6.yaml @@ -42,7 +42,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure - as: e2e-vsphere-upgrade @@ -74,7 +73,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn timeout: 5h30m0s 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 5ad6de1fadfdf..aa78b6d1c415d 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 @@ -53,8 +53,6 @@ tests: cron: 31 22 6,23 * * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-upgrade-azure - as: e2e-aws cron: 34 1 12,21 * * @@ -70,15 +68,11 @@ tests: cron: 30 2 11,22 * * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure - as: e2e-azure-ovn cron: 59 13 7,28 * * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-ovn zz_generated_metadata: branch: master diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.8-upgrade-from-stable-4.7.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.8-upgrade-from-stable-4.7.yaml index 80362d6f44fcf..9cd23522ebc7b 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.8-upgrade-from-stable-4.7.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.8-upgrade-from-stable-4.7.yaml @@ -42,7 +42,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure - as: e2e-ovirt-upgrade @@ -74,7 +73,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn timeout: 5h30m0s 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 2faf8fc2116bb..36b1eb29276b3 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 @@ -52,37 +52,28 @@ tests: cron: 41 9 7,25 * * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure - as: e2e-azure-ovn cron: 1 10 7,17 * * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-ovn - as: e2e-azure-serial cron: 33 6 2,21 * * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: e2e-azure-upgrade cron: 34 4 9,25 * * steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure - as: e2e-azure-cilium cron: 1 4 4,23 * * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-cilium - as: e2e-gcp cron: 28 12 8,19 * * diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.9-upgrade-from-stable-4.8.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.9-upgrade-from-stable-4.8.yaml index e678db7e562fd..148a796ce2aa8 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.9-upgrade-from-stable-4.8.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.9-upgrade-from-stable-4.8.yaml @@ -42,7 +42,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure - as: e2e-ovirt-upgrade @@ -74,7 +73,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure-ovn timeout: 5h30m0s 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 608faad578091..bb6cf6d2588d0 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 @@ -63,51 +63,38 @@ tests: cron: 0 23 12 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure - as: e2e-azure-techpreview cron: 48 23 7 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-techpreview - as: e2e-azure-serial cron: 6 16 14 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-serial - as: e2e-azure-techpreview-serial cron: 20 0 13 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-techpreview-serial - as: e2e-azure-upgrade cron: 33 9 13 */12 * steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-azure - as: e2e-azure-cilium cron: 28 4 4 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-cilium - as: e2e-azure-ovn cron: 32 23 7 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-ovn - as: e2e-gcp cron: 7 1 8 */12 * diff --git a/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.16.yaml b/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.16.yaml index 3f49faa509c5d..de2d5f200fcc0 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.16.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.16.yaml @@ -33,8 +33,6 @@ tests: interval: 24h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -77,8 +75,6 @@ tests: cron: 12 3 28 1 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch diff --git a/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.17.yaml b/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.17.yaml index 178597d990ece..f0a033b3484fb 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.17.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.17.yaml @@ -33,8 +33,6 @@ tests: interval: 24h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -77,8 +75,6 @@ tests: cron: 20 10 11 1 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch diff --git a/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.18.yaml b/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.18.yaml index 829d3db021608..9a44bf6f95cdc 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.18.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.18.yaml @@ -92,8 +92,6 @@ tests: interval: 24h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -136,8 +134,6 @@ tests: cron: 29 10 9 5 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch diff --git a/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.19.yaml b/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.19.yaml index 72fbe1264be0a..b76af1d3e502a 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.19.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.19.yaml @@ -96,8 +96,6 @@ tests: interval: 24h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -140,8 +138,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch diff --git a/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.20.yaml b/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.20.yaml index 15cfa3a26ed76..a7890be4a2d49 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.20.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.20.yaml @@ -96,8 +96,6 @@ tests: interval: 24h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -140,8 +138,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch diff --git a/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.21.yaml b/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.21.yaml index f337e513d85ee..86ff8cca8732c 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.21.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__cnv-nightly-4.21.yaml @@ -96,8 +96,6 @@ tests: interval: 24h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -140,8 +138,6 @@ tests: interval: 168h steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch diff --git a/ci-operator/config/openshift/release/openshift-release-master__konflux-nightly-4.18.yaml b/ci-operator/config/openshift/release/openshift-release-master__konflux-nightly-4.18.yaml index 5d923ca2d9c73..6077a01fa664e 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__konflux-nightly-4.18.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__konflux-nightly-4.18.yaml @@ -43,7 +43,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true" observers: enable: diff --git a/ci-operator/config/openshift/release/openshift-release-master__konflux-nightly-4.19.yaml b/ci-operator/config/openshift/release/openshift-release-master__konflux-nightly-4.19.yaml index f5b2a0f097c39..6c17bdd695494 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__konflux-nightly-4.19.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__konflux-nightly-4.19.yaml @@ -43,7 +43,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true" observers: enable: diff --git a/ci-operator/config/openshift/release/openshift-release-master__konflux-nightly-4.20.yaml b/ci-operator/config/openshift/release/openshift-release-master__konflux-nightly-4.20.yaml index 3cb4916e27134..86985e27b9f3d 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__konflux-nightly-4.20.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__konflux-nightly-4.20.yaml @@ -43,7 +43,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true" observers: enable: diff --git a/ci-operator/config/openshift/release/openshift-release-master__konflux-nightly-4.21.yaml b/ci-operator/config/openshift/release/openshift-release-master__konflux-nightly-4.21.yaml index 5e68f144b3b2d..7843c1b5b150e 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__konflux-nightly-4.21.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__konflux-nightly-4.21.yaml @@ -43,7 +43,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true" observers: enable: diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.10.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.10.yaml index a247a8128e67f..3384099f912ce 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.10.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.10.yaml @@ -253,7 +253,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" pre: - chain: ipi-azure-pre @@ -299,7 +298,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/serial pre: @@ -401,22 +399,16 @@ tests: cron: 13 3 7 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure - as: e2e-azure-csi cron: 29 10 8 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-csi - as: e2e-azure-csi-migration cron: 8 3 5 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-csi-migration - as: e2e-azurestack-csi cluster: build01 diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.11.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.11.yaml index d1d0c5018c3e5..1d12d08d08698 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.11.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.11.yaml @@ -294,7 +294,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" pre: - chain: ipi-azure-pre @@ -340,7 +339,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/serial pre: @@ -436,15 +434,11 @@ tests: cron: 59 8 7 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure - as: e2e-azure-csi cron: 0 5 5 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-csi - as: e2e-azurestack-csi cluster: build01 @@ -468,8 +462,6 @@ tests: cron: 42 10 8 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com test: - as: test cli: latest @@ -509,8 +501,6 @@ tests: cron: 40 1 7 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com test: - as: test commands: | diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.12.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.12.yaml index b9299a2d8cbad..ad5305018f289 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.12.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.12.yaml @@ -437,7 +437,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" observers: enable: @@ -493,7 +492,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/serial observers: @@ -628,8 +626,6 @@ tests: cron: 20 18 5 11 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -638,8 +634,6 @@ tests: cron: 11 18 13 6 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -675,8 +669,6 @@ tests: cron: 57 3 13 1 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -719,8 +711,6 @@ tests: cron: 36 8 7 6 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.13.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.13.yaml index eadf110358a95..3f45c68db19ed 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.13.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.13.yaml @@ -437,7 +437,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" observers: enable: @@ -513,7 +512,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/serial observers: @@ -640,8 +638,6 @@ tests: cron: 3 8 9 12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -650,8 +646,6 @@ tests: cron: 52 0 11 9 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -687,8 +681,6 @@ tests: cron: 36 16 17 11 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -731,8 +723,6 @@ tests: cron: 32 5 20 9 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.14.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.14.yaml index 3ed842f77ee84..ec6efb0f69558 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.14.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.14.yaml @@ -393,7 +393,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" observers: enable: @@ -469,7 +468,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/serial observers: @@ -589,8 +587,6 @@ tests: cron: 12 5 9 11 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -599,8 +595,6 @@ tests: cron: 4 16 19 7 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -620,8 +614,6 @@ tests: cron: 37 6 26 6 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -654,8 +646,6 @@ tests: cron: 18 17 2 7 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -698,8 +688,6 @@ tests: cron: 3 10 25 3 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.15.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.15.yaml index e2f0aa791ea96..9a19ba0fc762f 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.15.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.15.yaml @@ -420,7 +420,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" OVERRIDE_OPENSHIFT_SDN_DEPRECATION: "true" observers: @@ -500,7 +499,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" OVERRIDE_OPENSHIFT_SDN_DEPRECATION: "true" TEST_SUITE: openshift/conformance/serial @@ -628,7 +626,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OVERRIDE_OPENSHIFT_SDN_DEPRECATION: "true" observers: enable: @@ -638,8 +635,6 @@ tests: cron: 49 16 3 5 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -659,8 +654,6 @@ tests: cron: 18 17 23 2 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -697,8 +690,6 @@ tests: cron: 30 12 9 1 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch @@ -741,8 +732,6 @@ tests: cron: 8 10 20 3 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.16.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.16.yaml index 39a7b71d53598..2ef733833bc83 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.16.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.16.yaml @@ -443,7 +443,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" OVERRIDE_OPENSHIFT_SDN_DEPRECATION: "true" observers: @@ -523,7 +522,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" OVERRIDE_OPENSHIFT_SDN_DEPRECATION: "true" TEST_SUITE: openshift/conformance/serial @@ -651,7 +649,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OVERRIDE_OPENSHIFT_SDN_DEPRECATION: "true" observers: enable: @@ -661,8 +658,6 @@ tests: cron: 29 12 12 2 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.17.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.17.yaml index 0e391acef10b4..53acab697166e 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.17.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.17.yaml @@ -632,8 +632,6 @@ tests: cron: 22 10 3 4 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com observers: enable: - observers-resource-watch diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.18.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.18.yaml index e1dc13c9b236d..836a73805c099 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.18.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.18.yaml @@ -735,7 +735,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true" observers: enable: diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.19.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.19.yaml index 961711f290db8..73c9461ea3828 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.19.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.19.yaml @@ -832,7 +832,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true" observers: enable: diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.20.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.20.yaml index 52bb500026792..c9f4a636855ee 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.20.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.20.yaml @@ -913,7 +913,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true" observers: enable: diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.21.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.21.yaml index d37f90b30e356..b06dbf91539dc 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.21.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.21.yaml @@ -919,7 +919,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true" observers: enable: diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.6.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.6.yaml index 7c2fc6afe37e8..b4e0b088d496e 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.6.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.6.yaml @@ -129,7 +129,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" pre: - chain: ipi-azure-pre @@ -160,7 +159,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/serial pre: @@ -206,8 +204,6 @@ tests: cron: 22 3 20 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure zz_generated_metadata: branch: master diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.7.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.7.yaml index d2da56f038bee..2640acc53f4fd 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.7.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.7.yaml @@ -153,7 +153,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" pre: - chain: ipi-azure-pre @@ -189,7 +188,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/serial pre: @@ -281,8 +279,6 @@ tests: cron: 1 8 22 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure - as: e2e-powervs cron: 46 7 10 */12 * diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.8.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.8.yaml index df4b19c5c34b8..76d9f084c4619 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.8.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.8.yaml @@ -195,7 +195,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" pre: - chain: ipi-azure-pre @@ -236,7 +235,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/serial pre: @@ -338,8 +336,6 @@ tests: cron: 54 13 9 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure - as: e2e-gcp-serial cron: 56 22 10 */12 * diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.9.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.9.yaml index 4962e8ca2c52d..dc8a7532934ca 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.9.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.9.yaml @@ -224,7 +224,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" pre: - chain: ipi-azure-pre @@ -270,7 +269,6 @@ tests: steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/serial pre: @@ -372,22 +370,17 @@ tests: cron: 30 5 13 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure - as: e2e-azure-csi cron: 23 9 14 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-csi - as: e2e-azure-csi-migration cron: 26 10 6 */12 * steps: cluster_profile: azure-2 env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com CLUSTERCSIDRIVER: disk.csi.azure.com TEST_CSI_DRIVER_MANIFEST: manifest-azure-disk.yaml TEST_SUITE: openshift/csi @@ -414,8 +407,6 @@ tests: cron: 31 12 8 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com test: - as: test cli: latest @@ -455,8 +446,6 @@ tests: cron: 43 4 3 */12 * steps: cluster_profile: azure-2 - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com test: - as: test commands: | diff --git a/ci-operator/config/openshift/secrets-store-csi-driver-operator/openshift-secrets-store-csi-driver-operator-main.yaml b/ci-operator/config/openshift/secrets-store-csi-driver-operator/openshift-secrets-store-csi-driver-operator-main.yaml index ed07583b1bf78..2c1a7a23200d1 100644 --- a/ci-operator/config/openshift/secrets-store-csi-driver-operator/openshift-secrets-store-csi-driver-operator-main.yaml +++ b/ci-operator/config/openshift/secrets-store-csi-driver-operator/openshift-secrets-store-csi-driver-operator-main.yaml @@ -169,7 +169,6 @@ tests: OO_INDEX: ci-index-secrets-store-csi-driver-operator-bundle SECRETS_STORE_E2E_PROVIDER_IMAGE: secrets-store-csi-driver-e2eprovider env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers OO_PACKAGE: secrets-store-csi-driver-operator diff --git a/ci-operator/config/openshift/secrets-store-csi-driver-operator/openshift-secrets-store-csi-driver-operator-release-4.20.yaml b/ci-operator/config/openshift/secrets-store-csi-driver-operator/openshift-secrets-store-csi-driver-operator-release-4.20.yaml index 03fdf02688365..755744c1cccfa 100644 --- a/ci-operator/config/openshift/secrets-store-csi-driver-operator/openshift-secrets-store-csi-driver-operator-release-4.20.yaml +++ b/ci-operator/config/openshift/secrets-store-csi-driver-operator/openshift-secrets-store-csi-driver-operator-release-4.20.yaml @@ -169,7 +169,6 @@ tests: OO_INDEX: ci-index-secrets-store-csi-driver-operator-bundle SECRETS_STORE_E2E_PROVIDER_IMAGE: secrets-store-csi-driver-e2eprovider env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers OO_PACKAGE: secrets-store-csi-driver-operator diff --git a/ci-operator/config/openshift/secrets-store-csi-driver-operator/openshift-secrets-store-csi-driver-operator-release-4.21.yaml b/ci-operator/config/openshift/secrets-store-csi-driver-operator/openshift-secrets-store-csi-driver-operator-release-4.21.yaml index 5a41829c08773..58b4ead7347ea 100644 --- a/ci-operator/config/openshift/secrets-store-csi-driver-operator/openshift-secrets-store-csi-driver-operator-release-4.21.yaml +++ b/ci-operator/config/openshift/secrets-store-csi-driver-operator/openshift-secrets-store-csi-driver-operator-release-4.21.yaml @@ -170,7 +170,6 @@ tests: OO_INDEX: ci-index-secrets-store-csi-driver-operator-bundle SECRETS_STORE_E2E_PROVIDER_IMAGE: secrets-store-csi-driver-e2eprovider env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers OO_PACKAGE: secrets-store-csi-driver-operator diff --git a/ci-operator/config/openshift/secrets-store-csi-driver-operator/openshift-secrets-store-csi-driver-operator-release-4.22.yaml b/ci-operator/config/openshift/secrets-store-csi-driver-operator/openshift-secrets-store-csi-driver-operator-release-4.22.yaml index f149cc2c6ba63..7ed4dcad6fe4f 100644 --- a/ci-operator/config/openshift/secrets-store-csi-driver-operator/openshift-secrets-store-csi-driver-operator-release-4.22.yaml +++ b/ci-operator/config/openshift/secrets-store-csi-driver-operator/openshift-secrets-store-csi-driver-operator-release-4.22.yaml @@ -169,7 +169,6 @@ tests: OO_INDEX: ci-index-secrets-store-csi-driver-operator-bundle SECRETS_STORE_E2E_PROVIDER_IMAGE: secrets-store-csi-driver-e2eprovider env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com OO_CHANNEL: stable OO_INSTALL_NAMESPACE: openshift-cluster-csi-drivers OO_PACKAGE: secrets-store-csi-driver-operator diff --git a/ci-operator/config/openshift/secrets-store-csi-driver/openshift-secrets-store-csi-driver-main.yaml b/ci-operator/config/openshift/secrets-store-csi-driver/openshift-secrets-store-csi-driver-main.yaml index 10b265d079487..9002694037d71 100644 --- a/ci-operator/config/openshift/secrets-store-csi-driver/openshift-secrets-store-csi-driver-main.yaml +++ b/ci-operator/config/openshift/secrets-store-csi-driver/openshift-secrets-store-csi-driver-main.yaml @@ -114,8 +114,6 @@ tests: cluster_profile: azure-2 dependencies: SECRETS_STORE_CSI_DRIVER_IMAGE: secrets-store-csi-driver - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-csi-secrets-store-azure-operand - as: e2e-gcp steps: diff --git a/ci-operator/config/openshift/secrets-store-csi-driver/openshift-secrets-store-csi-driver-release-4.20.yaml b/ci-operator/config/openshift/secrets-store-csi-driver/openshift-secrets-store-csi-driver-release-4.20.yaml index 48f8215ad382e..606fd5b8f9f14 100644 --- a/ci-operator/config/openshift/secrets-store-csi-driver/openshift-secrets-store-csi-driver-release-4.20.yaml +++ b/ci-operator/config/openshift/secrets-store-csi-driver/openshift-secrets-store-csi-driver-release-4.20.yaml @@ -100,8 +100,6 @@ tests: cluster_profile: azure-2 dependencies: SECRETS_STORE_CSI_DRIVER_IMAGE: secrets-store-csi-driver - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-csi-secrets-store-azure-operand - as: e2e-gcp steps: diff --git a/ci-operator/config/openshift/secrets-store-csi-driver/openshift-secrets-store-csi-driver-release-4.21.yaml b/ci-operator/config/openshift/secrets-store-csi-driver/openshift-secrets-store-csi-driver-release-4.21.yaml index d1e9b16dbc028..9b603c5fb7c16 100644 --- a/ci-operator/config/openshift/secrets-store-csi-driver/openshift-secrets-store-csi-driver-release-4.21.yaml +++ b/ci-operator/config/openshift/secrets-store-csi-driver/openshift-secrets-store-csi-driver-release-4.21.yaml @@ -115,8 +115,6 @@ tests: cluster_profile: azure-2 dependencies: SECRETS_STORE_CSI_DRIVER_IMAGE: secrets-store-csi-driver - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-csi-secrets-store-azure-operand - as: e2e-gcp steps: diff --git a/ci-operator/config/openshift/secrets-store-csi-driver/openshift-secrets-store-csi-driver-release-4.22.yaml b/ci-operator/config/openshift/secrets-store-csi-driver/openshift-secrets-store-csi-driver-release-4.22.yaml index 682e90f05080b..fb289bbb366eb 100644 --- a/ci-operator/config/openshift/secrets-store-csi-driver/openshift-secrets-store-csi-driver-release-4.22.yaml +++ b/ci-operator/config/openshift/secrets-store-csi-driver/openshift-secrets-store-csi-driver-release-4.22.yaml @@ -114,8 +114,6 @@ tests: cluster_profile: azure-2 dependencies: SECRETS_STORE_CSI_DRIVER_IMAGE: secrets-store-csi-driver - env: - BASE_DOMAIN: ci2.azure.devcluster.openshift.com workflow: openshift-e2e-azure-csi-secrets-store-azure-operand - as: e2e-gcp steps: diff --git a/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-commands.sh b/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-commands.sh index 40a19e9be69b6..a3a65e9b67a9a 100755 --- a/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-commands.sh +++ b/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-commands.sh @@ -43,6 +43,13 @@ echo "get ocp version: ${version}" rm pull-secret popd +if [[ ! -r "${CLUSTER_PROFILE_DIR}/baseDomain" ]]; then + echo "Using default value: ${BASE_DOMAIN}" + AZURE_BASE_DOMAIN="${BASE_DOMAIN}" +else + AZURE_BASE_DOMAIN=$(< ${CLUSTER_PROFILE_DIR}/baseDomain) +fi + CONFIG="${SHARED_DIR}/install-config.yaml" REGION="${LEASED_RESOURCE}" @@ -80,7 +87,7 @@ echo "Using compute node replicas: ${workers}" echo "Using controlPlane node replicas: ${master_replicas}" cat >> "${CONFIG}" << EOF -baseDomain: ${BASE_DOMAIN} +baseDomain: ${AZURE_BASE_DOMAIN} platform: azure: region: ${REGION} diff --git a/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-ref.yaml b/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-ref.yaml index 9141207591558..a7d0ef5159ac1 100644 --- a/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-ref.yaml +++ b/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-ref.yaml @@ -52,7 +52,7 @@ ref: default: ci.azure.devcluster.openshift.com documentation: |- This value represents the the DNS zone that is configured in the azure portal, and it will be used in the base_domain field - of the install-config.yaml file. + of the install-config.yaml file. (default: azure4 cluster-profile) - name: BASE_DOMAIN_RESOURCE_GROUP default: "os4-common" documentation: |-