Remove unnecessary e2e tests - 4th pass (#3156)

Author: sgalsaleh

.github/workflows/ci.yaml

@@ -950,23 +950,17 @@ jobs:
       fail-fast: false
       matrix:
         test:
-          - TestSingleNodeAirgapUpgrade
           - TestSingleNodeAirgapUpgradeSelinux
           - TestMultiNodeAirgapUpgradePreviousStable
-          - TestMultiNodeAirgapHAInstallation
           - TestSingleNodeAirgapDisasterRecovery
           - TestMultiNodeAirgapHADisasterRecovery
         include:
           - test: TestVersion
             is-lxd: true
           - test: TestCommandsRequireSudo
             is-lxd: true
-          - test: TestSingleNodeDisasterRecoveryWithProxy
-            is-lxd: true
           - test: TestProxiedEnvironment
             is-lxd: true
-          - test: TestProxiedCustomCIDR
-            is-lxd: true
           - test: TestInstallWithMITMProxy
             is-lxd: true
           - test: TestSingleNodeNetworkReport

.github/workflows/release-prod.yaml

@@ -564,23 +564,17 @@ jobs:
       fail-fast: false
       matrix:
         test:
-          - TestSingleNodeAirgapUpgrade
           - TestSingleNodeAirgapUpgradeSelinux
           - TestMultiNodeAirgapUpgradePreviousStable
-          - TestMultiNodeAirgapHAInstallation
           - TestSingleNodeAirgapDisasterRecovery
           - TestMultiNodeAirgapHADisasterRecovery
         include:
           - test: TestVersion
             is-lxd: true
           - test: TestCommandsRequireSudo
             is-lxd: true
-          - test: TestSingleNodeDisasterRecoveryWithProxy
-            is-lxd: true
           - test: TestProxiedEnvironment
             is-lxd: true
-          - test: TestProxiedCustomCIDR
-            is-lxd: true
           - test: TestInstallWithMITMProxy
             is-lxd: true
     steps:

e2e/install_test.go

@@ -250,78 +250,6 @@ func TestUpgradeFromReplicatedAppPreviousK0s(t *testing.T) {
 	t.Logf("%s: test complete", time.Now().Format(time.RFC3339))
 }
 
-func TestSingleNodeAirgapUpgrade(t *testing.T) {
-	t.Parallel()
-
-	RequireEnvVars(t, []string{"SHORT_SHA"})
-
-	tc := cmx.NewCluster(&cmx.ClusterInput{
-		T:            t,
-		Nodes:        1,
-		Distribution: "ubuntu",
-		Version:      "22.04",
-	})
-	defer tc.Cleanup()
-
-	t.Logf("%s: downloading airgap files on node 0", time.Now().Format(time.RFC3339))
-	// Previous stable EC version with a -1 minor k0s version
-	initialVersion := fmt.Sprintf("appver-%s-previous-stable", os.Getenv("SHORT_SHA"))
-	runInParallel(t,
-		func(t *testing.T) error {
-			return downloadAirgapBundleOnNode(t, tc, 0, initialVersion, AirgapInstallBundlePath, AirgapLicenseID)
-		}, func(t *testing.T) error {
-			return downloadAirgapBundleOnNode(t, tc, 0, fmt.Sprintf("appver-%s-upgrade", os.Getenv("SHORT_SHA")), AirgapUpgradeBundlePath, AirgapLicenseID)
-		},
-	)
-
-	t.Logf("%s: airgapping cluster", time.Now().Format(time.RFC3339))
-	if err := tc.Airgap(); err != nil {
-		t.Fatalf("failed to airgap cluster: %v", err)
-	}
-
-	t.Logf("%s: preparing embedded cluster airgap files", time.Now().Format(time.RFC3339))
-	line := []string{"airgap-prepare.sh"}
-	if _, _, err := tc.RunCommandOnNode(0, line); err != nil {
-		t.Fatalf("fail to prepare airgap files on node %s: %v", tc.Nodes[0], err)
-	}
-
-	installSingleNodeWithOptions(t, tc, installOptions{
-		isAirgap:                true,
-		version:                 initialVersion,
-		localArtifactMirrorPort: "50001", // choose an alternate lam port
-	})
-
-	if stdout, stderr, err := tc.SetupPlaywrightAndRunTest("deploy-app"); err != nil {
-		t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
-	}
-
-	t.Logf("%s: checking installation state after app deployment", time.Now().Format(time.RFC3339))
-	line = []string{"check-airgap-installation-state.sh", initialVersion, k8sVersionPreviousStable()}
-	if _, _, err := tc.RunCommandOnNode(0, line); err != nil {
-		t.Fatalf("fail to check installation state: %v", err)
-	}
-
-	checkNodeJoinCommand(t, tc, 0)
-
-	t.Logf("%s: running airgap update", time.Now().Format(time.RFC3339))
-	line = []string{"airgap-update.sh"}
-	if _, _, err := tc.RunCommandOnNode(0, line); err != nil {
-		t.Fatalf("fail to run airgap update: %v", err)
-	}
-
-	appUpgradeVersion := fmt.Sprintf("appver-%s-upgrade", os.Getenv("SHORT_SHA"))
-	testArgs := []string{appUpgradeVersion}
-
-	t.Logf("%s: upgrading cluster", time.Now().Format(time.RFC3339))
-	if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
-		t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
-	}
-
-	checkPostUpgradeState(t, tc)
-
-	t.Logf("%s: test complete", time.Now().Format(time.RFC3339))
-}
-
 func TestSingleNodeAirgapUpgradeSelinux(t *testing.T) {
 	t.Parallel()
 
@@ -601,135 +529,6 @@ func TestMultiNodeHAInstallation(t *testing.T) {
 	t.Logf("%s: test complete", time.Now().Format(time.RFC3339))
 }
 
-// This test creates 4 airgap nodes, installs on the first one and then generate 2 join tokens
-// for controllers and one join token for worker nodes. Joins the nodes as airgap HA and then waits
-// for them to report ready. Runs additional high availability validations afterwards.
-func TestMultiNodeAirgapHAInstallation(t *testing.T) {
-	t.Parallel()
-
-	RequireEnvVars(t, []string{"SHORT_SHA"})
-
-	tc := cmx.NewCluster(&cmx.ClusterInput{
-		T:                      t,
-		Nodes:                  4,
-		Distribution:           "ubuntu",
-		Version:                "22.04",
-		InstanceType:           "r1.medium",
-		SupportBundleNodeIndex: 2,
-	})
-	defer tc.Cleanup()
-
-	t.Logf("%s: downloading airgap files on nodes", time.Now().Format(time.RFC3339))
-	initialVersion := fmt.Sprintf("appver-%s", os.Getenv("SHORT_SHA"))
-	upgradeVersion := fmt.Sprintf("appver-%s-upgrade", os.Getenv("SHORT_SHA"))
-	runInParallel(t,
-		func(t *testing.T) error {
-			return downloadAirgapBundleOnNode(t, tc, 0, initialVersion, AirgapInstallBundlePath, AirgapLicenseID)
-		},
-		func(t *testing.T) error {
-			return downloadAirgapBundleOnNode(t, tc, 0, upgradeVersion, AirgapUpgradeBundlePath, AirgapLicenseID)
-		},
-	)
-
-	// install "expect" dependency on node 3 as that's where the HA join command will run.
-	t.Logf("%s: installing expect package on node 3", time.Now().Format(time.RFC3339))
-	if stdout, stderr, err := tc.RunCommandOnNode(3, []string{"apt-get", "install", "-y", "expect"}); err != nil {
-		t.Fatalf("fail to install expect package on node 3: %v: %s: %s", err, stdout, stderr)
-	}
-
-	t.Logf("%s: airgapping cluster", time.Now().Format(time.RFC3339))
-	if err := tc.Airgap(); err != nil {
-		t.Fatalf("failed to airgap cluster: %v", err)
-	}
-
-	t.Logf("%s: preparing embedded cluster airgap files on node 0", time.Now().Format(time.RFC3339))
-	line := []string{"airgap-prepare.sh"}
-	if stdout, stderr, err := tc.RunCommandOnNode(0, line); err != nil {
-		t.Fatalf("fail to prepare airgap files on node 0: %v: %s: %s", err, stdout, stderr)
-	}
-
-	installSingleNodeWithOptions(t, tc, installOptions{
-		isAirgap: true,
-	})
-
-	checkWorkerProfile(t, tc, 0)
-
-	if stdout, stderr, err := tc.SetupPlaywrightAndRunTest("deploy-app"); err != nil {
-		t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
-	}
-
-	t.Logf("%s: checking installation state after app deployment", time.Now().Format(time.RFC3339))
-	line = []string{"check-airgap-installation-state.sh", fmt.Sprintf("appver-%s", os.Getenv("SHORT_SHA")), k8sVersion()}
-	if stdout, stderr, err := tc.RunCommandOnNode(0, line); err != nil {
-		t.Fatalf("fail to check installation state: %v: %s: %s", err, stdout, stderr)
-	}
-
-	// join a worker
-	joinWorkerNode(t, tc, 1)
-	checkWorkerProfile(t, tc, 1)
-
-	// join a controller
-	joinControllerNode(t, tc, 2)
-	checkWorkerProfile(t, tc, 2)
-
-	// join another controller in HA mode
-	joinControllerNodeWithOptions(t, tc, 3, joinOptions{isHA: true})
-	checkWorkerProfile(t, tc, 3)
-
-	// wait for the nodes to report as ready.
-	waitForNodes(t, tc, 4, nil)
-
-	t.Logf("%s: checking installation state after enabling high availability", time.Now().Format(time.RFC3339))
-	line = []string{"check-airgap-post-ha-state.sh", os.Getenv("SHORT_SHA"), k8sVersion()}
-	if stdout, stderr, err := tc.RunCommandOnNode(0, line); err != nil {
-		t.Fatalf("fail to check post ha state: %v: %s: %s", err, stdout, stderr)
-	}
-
-	t.Logf("%s: running airgap update", time.Now().Format(time.RFC3339))
-	line = []string{"airgap-update.sh"}
-	if stdout, stderr, err := tc.RunCommandOnNode(0, line); err != nil {
-		t.Fatalf("fail to run airgap update: %v: %s: %s", err, stdout, stderr)
-	}
-
-	appUpgradeVersion := fmt.Sprintf("appver-%s-upgrade", os.Getenv("SHORT_SHA"))
-	testArgs := []string{appUpgradeVersion}
-
-	t.Logf("%s: upgrading cluster", time.Now().Format(time.RFC3339))
-	if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
-		t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
-	}
-
-	checkPostUpgradeState(t, tc)
-
-	stdout, stderr, err := resetInstallationWithError(t, tc, 0, resetInstallationOptions{})
-	if err != nil {
-		t.Fatalf("fail to reset the installation on node 0: %v: %s: %s", err, stdout, stderr)
-	}
-	if !strings.Contains(stdout, "High-availability is enabled and requires at least three controller-test nodes") {
-		t.Logf("reset output does not contain the ha warning: stdout: %s\nstderr: %s", stdout, stderr)
-	}
-
-	stdout, stderr, err = tc.RunCommandOnNode(2, []string{"check-nodes-removed.sh", "3"})
-	if err != nil {
-		t.Fatalf("fail to check nodes removed: %v: %s: %s", err, stdout, stderr)
-	}
-
-	t.Logf("%s: checking nllb", time.Now().Format(time.RFC3339))
-	line = []string{"check-nllb.sh"}
-	if stdout, stderr, err := tc.RunCommandOnNode(2, line); err != nil {
-		t.Fatalf("fail to check nllb: %v: %s: %s", err, stdout, stderr)
-	}
-
-	checkPostUpgradeStateWithOptions(t, tc, postUpgradeStateOptions{
-		node: 2,
-		withEnv: map[string]string{
-			"ALLOW_PENDING_PODS": "true",
-		},
-	})
-
-	t.Logf("%s: test complete", time.Now().Format(time.RFC3339))
-}
-
 func TestSingleNodeInstallationNoopUpgrade(t *testing.T) {
 	t.Parallel()