From 5d681ab904026259084f629d88a7af1d4586581b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 May 2026 18:18:26 +0200 Subject: [PATCH] test(e2e): remove n2/n3/n4 minor release NodePool skew tests The e2e-aws job defines 6+ releases (latest, initial, n1minor through n4minor). ci-operator imports them concurrently, creating CLI extraction pods in parallel. This triggers a race condition in ci-tools where pods disappear or hit UID mismatches, causing ~40-45% of e2e-aws runs to fail before any test executes. Remove the n2, n3, and n4 minor release tests because: - N4 (n-4, unsupported skew): only validates that the SupportedVersionSkew condition is set to False. This is already fully covered by TestValidateVersionSkew unit tests in support/supportedversion/version_test.go. - N3 (n-3): creates a real AWS node to validate labels/taints, but this is identical to what N1 already covers. Labels and taints depend on the NodePool spec, not the release version. - N2 (n-2): same code path as N1, just a different version number. No hypershift logic behaves differently for n-1 vs n-2. Keeping only N1 (n-1) is sufficient to validate that nodes with an older release image can provision and join the cluster. This reduces the job from 6 to 3 release imports, cutting CI time by ~15-30 min and significantly reducing exposure to the ci-tools race condition. Co-Authored-By: Claude Opus 4.6 (1M context) Signed-off-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- test/e2e/e2e_test.go | 3 --- test/e2e/nodepool_test.go | 12 ------------ test/e2e/util/options.go | 3 --- 3 files changed, 18 deletions(-) diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index c3e1a1c5c87e..16ac0163ff1b 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -70,9 +70,6 @@ func TestMain(m *testing.M) { flag.StringVar(&globalOpts.ConfigurableClusterOptions.PullSecretFile, "e2e.pull-secret-file", "", "path to pull secret") flag.StringVar(&globalOpts.ConfigurableClusterOptions.SSHKeyFile, "e2e.ssh-key-file", "", "Path to a ssh public key") flag.StringVar(&globalOpts.N1MinorReleaseImage, "e2e.n1-minor-release-image", "", "The n-1 minor OCP release image relative to the latest") - flag.StringVar(&globalOpts.N2MinorReleaseImage, "e2e.n2-minor-release-image", "", "The n-2 minor OCP release image relative to the latest") - flag.StringVar(&globalOpts.N3MinorReleaseImage, "e2e.n3-minor-release-image", "", "The n-3 minor OCP release image relative to the latest") - flag.StringVar(&globalOpts.N4MinorReleaseImage, "e2e.n4-minor-release-image", "", "The n-4 minor OCP release image relative to the latest") flag.StringVar(&globalOpts.PlatformRaw, "e2e.platform", string(hyperv1.AWSPlatform), "The platform to use for the tests") flag.Var(&globalOpts.ConfigurableClusterOptions.Annotations, "e2e.annotations", "Annotations to apply to the HostedCluster (key=value). Can be specified multiple times") flag.Var(&globalOpts.ConfigurableClusterOptions.DisableClusterCapabilities, "e2e.disable-cluster-capabilities", "Cluster capabilities to disable (e.g. ImageRegistry,Console). Can be specified multiple times") diff --git a/test/e2e/nodepool_test.go b/test/e2e/nodepool_test.go index 6e40796a160a..561588c5bf5b 100644 --- a/test/e2e/nodepool_test.go +++ b/test/e2e/nodepool_test.go @@ -125,18 +125,6 @@ func TestNodePool(t *testing.T) { name: "TestNodePoolPrevReleaseN1", test: NewNodePoolPrevReleaseCreateTest(hostedCluster, globalOpts.N1MinorReleaseImage, clusterOpts, true), }, - { - name: "TestNodePoolPrevReleaseN2", - test: NewNodePoolPrevReleaseCreateTest(hostedCluster, globalOpts.N2MinorReleaseImage, clusterOpts, true), - }, - { - name: "TestNodePoolPrevReleaseN3", - test: NewNodePoolPrevReleaseCreateTest(hostedCluster, globalOpts.N3MinorReleaseImage, clusterOpts, true), - }, - { - name: "TestNodePoolPrevReleaseN4", - test: NewNodePoolPrevReleaseCreateTest(hostedCluster, globalOpts.N4MinorReleaseImage, clusterOpts, false), - }, { name: "TestMirrorConfigs", test: NewMirrorConfigsTest(ctx, mgtClient, hostedCluster, hostedClusterClient), diff --git a/test/e2e/util/options.go b/test/e2e/util/options.go index d065ba739f45..6f49a1aa3334 100644 --- a/test/e2e/util/options.go +++ b/test/e2e/util/options.go @@ -41,9 +41,6 @@ const ( type Options struct { LatestReleaseImage string PreviousReleaseImage string - N4MinorReleaseImage string - N3MinorReleaseImage string - N2MinorReleaseImage string N1MinorReleaseImage string IsRunningInCI bool ArtifactDir string