From f8740464c2d3b1e5dbbd099c76c84f5ed1260b07 Mon Sep 17 00:00:00 2001 From: smg247 Date: Tue, 7 Oct 2025 12:28:37 -0400 Subject: [PATCH] move 4.21 openshift/release variant periodics to azure4 due to lease contention in azure-2 --- ...ter__ci-4.21-upgrade-from-stable-4.20.yaml | 4 ++-- .../openshift-release-master__ci-4.21.yaml | 18 +++++++------- ...penshift-release-master__nightly-4.21.yaml | 2 +- .../openshift-release-master-periodics.yaml | 24 +++++++++---------- 4 files changed, 24 insertions(+), 24 deletions(-) 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 41ef6bf7b6077..3afcec80de377 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 @@ -88,7 +88,7 @@ tests: - as: e2e-azure-ovn-upgrade interval: 168h steps: - cluster_profile: azure-2 + cluster_profile: azure4 env: CONTROL_PLANE_INSTANCE_TYPE: Standard_D8as_v5 FAIL_ON_CORE_DUMP: "true" @@ -112,7 +112,7 @@ tests: - as: e2e-azure-runc-upgrade cron: '@weekly' steps: - cluster_profile: azure-2 + cluster_profile: azure4 env: CONTROL_PLANE_INSTANCE_TYPE: Standard_D8as_v5 FAIL_ON_CORE_DUMP: "true" 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 dc7a626eaaede..1f6245671a458 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 @@ -134,7 +134,7 @@ tests: - as: e2e-azure-ovn-techpreview interval: 168h steps: - cluster_profile: azure-2 + cluster_profile: azure4 env: FEATURE_SET: TechPreviewNoUpgrade observers: @@ -144,7 +144,7 @@ tests: - as: e2e-azure-ovn-serial interval: 168h steps: - cluster_profile: azure-2 + cluster_profile: azure4 observers: enable: - observers-resource-watch @@ -152,7 +152,7 @@ tests: - as: e2e-azure-ovn-techpreview-serial interval: 168h steps: - cluster_profile: azure-2 + cluster_profile: azure4 env: FEATURE_SET: TechPreviewNoUpgrade observers: @@ -163,7 +163,7 @@ tests: - as: e2e-azure-ovn-upgrade interval: 168h steps: - cluster_profile: azure-2 + cluster_profile: azure4 env: FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance @@ -175,7 +175,7 @@ tests: - as: e2e-azure-ovn-techpreview-upgrade interval: 168h steps: - cluster_profile: azure-2 + cluster_profile: azure4 env: FAIL_ON_CORE_DUMP: "true" FEATURE_SET: TechPreviewNoUpgrade @@ -188,7 +188,7 @@ tests: - as: e2e-azure-ovn-upgrade-out-of-change interval: 168h steps: - cluster_profile: azure-2 + cluster_profile: azure4 dependencies: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial @@ -203,7 +203,7 @@ tests: - as: e2e-azure-cilium interval: 168h steps: - cluster_profile: azure-2 + cluster_profile: azure4 observers: enable: - observers-resource-watch @@ -211,7 +211,7 @@ tests: - as: e2e-azure-ovn interval: 168h steps: - cluster_profile: azure-2 + cluster_profile: azure4 env: FAIL_ON_CORE_DUMP: "true" observers: @@ -354,7 +354,7 @@ tests: - as: e2e-azure-runc-upgrade cron: '@daily' steps: - cluster_profile: azure-2 + cluster_profile: azure4 env: FAIL_ON_CORE_DUMP: "true" TEST_TYPE: upgrade-conformance 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 b06dbf91539dc..c076cd6449b2f 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 @@ -917,7 +917,7 @@ tests: - as: e2e-azure-csi interval: 168h steps: - cluster_profile: azure-2 + cluster_profile: azure4 env: ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true" observers: diff --git a/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml index e46beeee64815..9c96f5da1715b 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml @@ -41431,7 +41431,7 @@ periodics: interval: 168h labels: ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure-2 + ci-operator.openshift.io/cloud-cluster-profile: azure4 ci-operator.openshift.io/variant: ci-4.21 ci.openshift.io/generator: prowgen ci.openshift.io/no-builds: "true" @@ -41507,7 +41507,7 @@ periodics: interval: 168h labels: ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure-2 + ci-operator.openshift.io/cloud-cluster-profile: azure4 ci-operator.openshift.io/variant: ci-4.21 ci.openshift.io/generator: prowgen ci.openshift.io/no-builds: "true" @@ -41583,7 +41583,7 @@ periodics: interval: 168h labels: ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure-2 + ci-operator.openshift.io/cloud-cluster-profile: azure4 ci-operator.openshift.io/variant: ci-4.21 ci.openshift.io/generator: prowgen ci.openshift.io/no-builds: "true" @@ -41659,7 +41659,7 @@ periodics: interval: 168h labels: ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure-2 + ci-operator.openshift.io/cloud-cluster-profile: azure4 ci-operator.openshift.io/variant: ci-4.21 ci.openshift.io/generator: prowgen ci.openshift.io/no-builds: "true" @@ -41736,7 +41736,7 @@ periodics: interval: 168h labels: ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure-2 + ci-operator.openshift.io/cloud-cluster-profile: azure4 ci-operator.openshift.io/variant: ci-4.21 ci.openshift.io/generator: prowgen ci.openshift.io/no-builds: "true" @@ -41813,7 +41813,7 @@ periodics: interval: 168h labels: ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure-2 + ci-operator.openshift.io/cloud-cluster-profile: azure4 ci-operator.openshift.io/variant: ci-4.21 ci.openshift.io/generator: prowgen ci.openshift.io/no-builds: "true" @@ -41890,7 +41890,7 @@ periodics: interval: 168h labels: ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure-2 + ci-operator.openshift.io/cloud-cluster-profile: azure4 ci-operator.openshift.io/variant: ci-4.21 ci.openshift.io/generator: prowgen ci.openshift.io/no-builds: "true" @@ -41967,7 +41967,7 @@ periodics: interval: 168h labels: ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure-2 + ci-operator.openshift.io/cloud-cluster-profile: azure4 ci-operator.openshift.io/variant: ci-4.21 ci.openshift.io/generator: prowgen ci.openshift.io/no-builds: "true" @@ -42043,7 +42043,7 @@ periodics: repo: release labels: ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure-2 + ci-operator.openshift.io/cloud-cluster-profile: azure4 ci-operator.openshift.io/variant: ci-4.21 ci.openshift.io/generator: prowgen ci.openshift.io/no-builds: "true" @@ -43416,7 +43416,7 @@ periodics: interval: 168h labels: ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure-2 + ci-operator.openshift.io/cloud-cluster-profile: azure4 ci-operator.openshift.io/variant: ci-4.21-upgrade-from-stable-4.20 ci.openshift.io/generator: prowgen ci.openshift.io/no-builds: "true" @@ -43492,7 +43492,7 @@ periodics: repo: release labels: ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure-2 + ci-operator.openshift.io/cloud-cluster-profile: azure4 ci-operator.openshift.io/variant: ci-4.21-upgrade-from-stable-4.20 ci.openshift.io/generator: prowgen ci.openshift.io/no-builds: "true" @@ -163958,7 +163958,7 @@ periodics: interval: 168h labels: ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure-2 + ci-operator.openshift.io/cloud-cluster-profile: azure4 ci-operator.openshift.io/variant: nightly-4.21 ci.openshift.io/generator: prowgen ci.openshift.io/no-builds: "true"