From fbf2481124ed965ae58f009731e27fc3e7573104 Mon Sep 17 00:00:00 2001 From: Juan Manuel Parrilla Madrid Date: Thu, 21 May 2026 19:04:31 +0200 Subject: [PATCH] ci(hypershift): remove n2/n3/n4 minor release imports from main branch jobs Stop importing n2minor (4.21), n3minor (4.20), and n4minor (4.19) release payloads for hypershift main branch CI jobs. These releases were only used by NodePool version skew e2e tests that have been removed in openshift/hypershift#8570 because: - The version skew validation is already covered by unit tests - Labels/taints validation is already covered by the n1minor test - Each extra release import adds ~5-10 min of CI time and increases exposure to a ci-tools race condition in CLI image extraction The step registry still declares OCP_IMAGE_N2/N3/N4 as optional dependencies with defaults, so release branch configs that still reference them are unaffected. Co-Authored-By: Claude Opus 4.6 (1M context) Signed-off-by: Juan Manuel Parrilla Madrid --- .../hypershift/openshift-hypershift-main.yaml | 37 ------------------- 1 file changed, 37 deletions(-) diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml index 6e3f3a73c3617..cdffbaa4c2ba6 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml @@ -107,21 +107,6 @@ releases: product: ocp stream: ci version: "4.22" - n2minor: - candidate: - product: ocp - stream: ci - version: "4.21" - n3minor: - candidate: - product: ocp - stream: ci - version: "4.20" - n4minor: - candidate: - product: ocp - stream: ci - version: "4.19" resources: '*': limits: @@ -145,9 +130,6 @@ tests: cluster_profile: hypershift-aks dependencies: OCP_IMAGE_N1: release:n1minor - OCP_IMAGE_N2: release:n2minor - OCP_IMAGE_N3: release:n3minor - OCP_IMAGE_N4: release:n4minor env: AUTH_THROUGH_CERTS: "true" ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true" @@ -168,9 +150,6 @@ tests: dependencies: OCP_IMAGE_LATEST: release:latest-422 OCP_IMAGE_N1: release:latest-421 - OCP_IMAGE_N2: release:latest-420 - OCP_IMAGE_N3: release:latest-419 - OCP_IMAGE_N4: release:latest-418 OCP_IMAGE_PREVIOUS: release:initial-422 env: AUTH_THROUGH_CERTS: "true" @@ -196,9 +175,6 @@ tests: cluster_profile: hypershift-aws dependencies: OCP_IMAGE_N1: release:n1minor - OCP_IMAGE_N2: release:n2minor - OCP_IMAGE_N3: release:n3minor - OCP_IMAGE_N4: release:n4minor env: ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true" REQUEST_SERVING_COMPONENT_TEST: "true" @@ -230,7 +206,6 @@ tests: cluster_profile: hypershift-azure dependencies: OCP_IMAGE_N1: release:n1minor - OCP_IMAGE_N2: release:n2minor env: CI_TESTS_RUN: ^(TestCreateCluster$|TestAutoscaling|TestNodePool|TestUpgradeControlPlane|TestHAEtcdChaos|TestAzureOAuthLoadBalancer|TestAzurePrivateTopology)$ E2E_RESOURCE_REQUEST_OVERRIDES: "1" @@ -258,9 +233,6 @@ tests: cluster_profile: hypershift-aws dependencies: OCP_IMAGE_N1: release:n1minor - OCP_IMAGE_N2: release:n2minor - OCP_IMAGE_N3: release:n3minor - OCP_IMAGE_N4: release:n4minor env: CI_TESTS_RUN: (^(TestCreateCluster$|TestCreateClusterV2$)) ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true" @@ -273,9 +245,6 @@ tests: cluster_profile: hypershift-aws dependencies: OCP_IMAGE_N1: release:n1minor - OCP_IMAGE_N2: release:n2minor - OCP_IMAGE_N3: release:n3minor - OCP_IMAGE_N4: release:n4minor env: ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true" REQUEST_SERVING_COMPONENT_TEST: "true" @@ -316,9 +285,6 @@ tests: dependencies: OCP_IMAGE_LATEST: release:latest-422 OCP_IMAGE_N1: release:latest-421 - OCP_IMAGE_N2: release:latest-420 - OCP_IMAGE_N3: release:latest-419 - OCP_IMAGE_N4: release:latest-418 OCP_IMAGE_PREVIOUS: release:initial-422 env: ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true" @@ -488,9 +454,6 @@ tests: cluster_profile: hypershift-aws dependencies: OCP_IMAGE_N1: release:n1minor - OCP_IMAGE_N2: release:n2minor - OCP_IMAGE_N3: release:n3minor - OCP_IMAGE_N4: release:n4minor env: CI_TESTS_RUN: ^TestKarpenter$ ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"