Fix tests to use new join commands (#2135)

Author: sgalsaleh

e2e/install_test.go

@@ -454,8 +454,8 @@ func TestSingleNodeUpgradePreviousStable(t *testing.T) {
 		version: initialVersion,
 	})
 
-	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)
+	if stdout, stderr, err := tc.SetupPlaywrightAndRunTest("deploy-ec23-app"); err != nil {
+		t.Fatalf("fail to run playwright test deploy-ec23-app: %v: %s: %s", err, stdout, stderr)
 	}
 
 	checkInstallationStateWithOptions(t, tc, installationStateOptions{
@@ -468,7 +468,7 @@ func TestSingleNodeUpgradePreviousStable(t *testing.T) {
 
 	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-app: %v: %s: %s", err, stdout, stderr)
+		t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
 	}
 
 	t.Logf("%s: re-installing kots cli on node 0", time.Now().Format(time.RFC3339))
@@ -486,7 +486,7 @@ func TestSingleNodeUpgradePreviousStable(t *testing.T) {
 
 	t.Logf("%s: upgrading cluster a second time", time.Now().Format(time.RFC3339))
 	if stdout, stderr, err := tc.RunPlaywrightTest("deploy-upgrade", testArgs...); err != nil {
-		t.Fatalf("fail to run playwright test deploy-app: %v: %s: %s", err, stdout, stderr)
+		t.Fatalf("fail to run playwright test deploy-upgrade: %v: %s: %s", err, stdout, stderr)
 	}
 
 	t.Logf("%s: checking installation state after second upgrade", time.Now().Format(time.RFC3339))
@@ -585,8 +585,8 @@ func TestUpgradeEC18FromReplicatedApp(t *testing.T) {
 	if err := tc.SetupPlaywright(withEnv); err != nil {
 		t.Fatalf("fail to setup playwright: %v", err)
 	}
-	if stdout, stderr, err := tc.RunPlaywrightTest("deploy-ec18-app-version"); err != nil {
-		t.Fatalf("fail to run playwright test deploy-ec18-app-version: %v: %s: %s", err, stdout, stderr)
+	if stdout, stderr, err := tc.RunPlaywrightTest("deploy-ec18-app"); err != nil {
+		t.Fatalf("fail to run playwright test deploy-ec18-app: %v: %s: %s", err, stdout, stderr)
 	}
 
 	t.Logf("%s: generating a new worker token command", time.Now().Format(time.RFC3339))
@@ -1138,8 +1138,8 @@ func TestAirgapUpgradeFromEC18(t *testing.T) {
 	if err := tc.SetupPlaywright(withEnv); err != nil {
 		t.Fatalf("fail to setup playwright: %v", err)
 	}
-	if _, _, err := tc.RunPlaywrightTest("deploy-ec18-app-version"); err != nil {
-		t.Fatalf("fail to run playwright test deploy-ec18-app-version: %v", err)
+	if _, _, err := tc.RunPlaywrightTest("deploy-ec18-app"); err != nil {
+		t.Fatalf("fail to run playwright test deploy-ec18-app: %v", err)
 	}
 
 	// generate worker node join command.
@@ -1336,58 +1336,16 @@ func TestMultiNodeAirgapUpgradeSameK0s(t *testing.T) {
 	if _, _, err := tc.RunCommandOnNode(0, line); err != nil {
 		t.Fatalf("fail to remove embedded-cluster binary on node %s: %v", tc.Nodes[0], err)
 	}
-	line = []string{"rm", "/var/lib/embedded-cluster/bin/embedded-cluster"}
-	if _, _, err := tc.RunCommandOnNode(0, line); err != nil {
-		t.Fatalf("fail to remove embedded-cluster binary on node %s: %v", tc.Nodes[0], err)
-	}
 
 	if _, _, err := tc.SetupPlaywrightAndRunTest("deploy-app"); err != nil {
 		t.Fatalf("fail to run playwright test deploy-app: %v", err)
 	}
 
-	// generate worker node join command.
-	t.Logf("%s: generating a new worker token command", time.Now().Format(time.RFC3339))
-	stdout, stderr, err := tc.RunPlaywrightTest("get-join-worker-command")
-	if err != nil {
-		t.Fatalf("fail to generate worker join token:\nstdout: %s\nstderr: %s", stdout, stderr)
-	}
-	workerCommand, err := findJoinCommandInOutput(stdout)
-	if err != nil {
-		t.Fatalf("fail to find the join command in the output: %v", err)
-	}
-	t.Log("worker join token command:", workerCommand)
-
-	// join the worker node
-	t.Logf("%s: preparing embedded cluster airgap files on worker node", time.Now().Format(time.RFC3339))
-	line = []string{"airgap-prepare.sh"}
-	if _, _, err := tc.RunCommandOnNode(1, line); err != nil {
-		t.Fatalf("fail to prepare airgap files on worker node: %v", err)
-	}
-	t.Logf("%s: joining worker node to the cluster", time.Now().Format(time.RFC3339))
-	if _, _, err := tc.RunCommandOnNode(1, strings.Split(workerCommand, " ")); err != nil {
-		t.Fatalf("fail to join worker node to the cluster: %v", err)
-	}
-	// remove artifacts after joining to save space
-	line = []string{"rm", "/assets/release.airgap"}
-	if _, _, err := tc.RunCommandOnNode(1, line); err != nil {
-		t.Fatalf("fail to remove airgap bundle on worker node: %v", err)
-	}
-	line = []string{"rm", "/usr/local/bin/embedded-cluster"}
-	if _, _, err := tc.RunCommandOnNode(1, line); err != nil {
-		t.Fatalf("fail to remove embedded-cluster binary on worker node: %v", err)
-	}
-	line = []string{"rm", "/var/lib/embedded-cluster/bin/embedded-cluster"}
-	if _, _, err := tc.RunCommandOnNode(1, line); err != nil {
-		t.Fatalf("fail to remove embedded-cluster binary on node %s: %v", tc.Nodes[0], err)
-	}
+	// join a worker
+	joinWorkerNode(t, tc, 1)
 
 	// wait for the nodes to report as ready.
-	t.Logf("%s: all nodes joined, waiting for them to be ready", time.Now().Format(time.RFC3339))
-	stdout, _, err = tc.RunCommandOnNode(0, []string{"wait-for-ready-nodes.sh", "2"})
-	if err != nil {
-		t.Log(stdout)
-		t.Fatalf("fail to wait for ready nodes: %v", err)
-	}
+	waitForNodes(t, tc, 2, nil)
 
 	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()}
@@ -1496,45 +1454,11 @@ func TestMultiNodeAirgapUpgrade(t *testing.T) {
 		t.Fatalf("fail to run playwright test deploy-app: %v", err)
 	}
 
-	// generate worker node join command.
-	t.Logf("%s: generating a new worker token command", time.Now().Format(time.RFC3339))
-	stdout, stderr, err := tc.RunPlaywrightTest("get-join-worker-command")
-	if err != nil {
-		t.Fatalf("fail to generate worker join token:\nstdout: %s\nstderr: %s", stdout, stderr)
-	}
-	workerCommand, err := findJoinCommandInOutput(stdout)
-	if err != nil {
-		t.Fatalf("fail to find the join command in the output: %v", err)
-	}
-	t.Log("worker join token command:", workerCommand)
-
-	// join the worker node
-	t.Logf("%s: preparing embedded cluster airgap files on worker node", time.Now().Format(time.RFC3339))
-	line = []string{"airgap-prepare.sh"}
-	if _, _, err := tc.RunCommandOnNode(1, line); err != nil {
-		t.Fatalf("fail to prepare airgap files on worker node: %v", err)
-	}
-	t.Logf("%s: joining worker node to the cluster", time.Now().Format(time.RFC3339))
-	if _, _, err := tc.RunCommandOnNode(1, strings.Split(workerCommand, " ")); err != nil {
-		t.Fatalf("fail to join worker node to the cluster: %v", err)
-	}
-	// remove the airgap bundle and binary after joining
-	line = []string{"rm", "/assets/release.airgap"}
-	if _, _, err := tc.RunCommandOnNode(1, line); err != nil {
-		t.Fatalf("fail to remove airgap bundle on worker node: %v", err)
-	}
-	line = []string{"rm", "/usr/local/bin/embedded-cluster"}
-	if _, _, err := tc.RunCommandOnNode(1, line); err != nil {
-		t.Fatalf("fail to remove embedded-cluster binary on worker node: %v", err)
-	}
+	// join a worker
+	joinWorkerNode(t, tc, 1)
 
 	// wait for the nodes to report as ready.
-	t.Logf("%s: all nodes joined, waiting for them to be ready", time.Now().Format(time.RFC3339))
-	stdout, _, err = tc.RunCommandOnNode(0, []string{"wait-for-ready-nodes.sh", "2"})
-	if err != nil {
-		t.Log(stdout)
-		t.Fatalf("fail to wait for ready nodes: %v", err)
-	}
+	waitForNodes(t, tc, 2, nil)
 
 	t.Logf("%s: checking installation state after app deployment", time.Now().Format(time.RFC3339))
 	line = []string{"check-airgap-installation-state.sh", initialVersion, k8sVersionPrevious()}
@@ -1655,13 +1579,13 @@ func TestMultiNodeAirgapUpgradePreviousStable(t *testing.T) {
 	if err := tc.SetupPlaywright(withEnv); err != nil {
 		t.Fatalf("fail to setup playwright: %v", err)
 	}
-	if _, _, err := tc.RunPlaywrightTest("deploy-app"); err != nil {
-		t.Fatalf("fail to run playwright test deploy-app: %v", err)
+	if _, _, err := tc.RunPlaywrightTest("deploy-ec23-app"); err != nil {
+		t.Fatalf("fail to run playwright test deploy-ec23-app: %v", err)
 	}
 
 	// generate worker node join command.
 	t.Logf("%s: generating a new worker token command", time.Now().Format(time.RFC3339))
-	stdout, stderr, err := tc.RunPlaywrightTest("get-join-worker-command")
+	stdout, stderr, err := tc.RunPlaywrightTest("get-ec23-join-worker-command")
 	if err != nil {
 		t.Fatalf("fail to generate worker join token:\nstdout: %s\nstderr: %s", stdout, stderr)
 	}
@@ -1681,7 +1605,7 @@ func TestMultiNodeAirgapUpgradePreviousStable(t *testing.T) {
 	if _, _, err := tc.RunCommandOnNode(1, strings.Split(workerCommand, " "), withEnv); err != nil {
 		t.Fatalf("fail to join worker node to the cluster: %v", err)
 	}
-	// remove the airgap bundle and binary after joining
+	// remove artifacts after joining to save space
 	line = []string{"rm", "/assets/release.airgap"}
 	if _, _, err := tc.RunCommandOnNode(1, line); err != nil {
 		t.Fatalf("fail to remove airgap bundle on worker node: %v", err)
@@ -1692,16 +1616,11 @@ func TestMultiNodeAirgapUpgradePreviousStable(t *testing.T) {
 	}
 	line = []string{"rm", "/var/lib/ec/bin/embedded-cluster"}
 	if _, _, err := tc.RunCommandOnNode(1, line); err != nil {
-		t.Fatalf("fail to remove embedded-cluster binary on node %s: %v", tc.Nodes[1], err)
+		t.Fatalf("fail to remove embedded-cluster binary on node %s: %v", tc.Nodes[0], err)
 	}
 
 	// wait for the nodes to report as ready.
-	t.Logf("%s: all nodes joined, waiting for them to be ready", time.Now().Format(time.RFC3339))
-	stdout, _, err = tc.RunCommandOnNode(0, []string{"wait-for-ready-nodes.sh", "2"}, withEnv)
-	if err != nil {
-		t.Log(stdout)
-		t.Fatalf("fail to wait for ready nodes: %v", err)
-	}
+	waitForNodes(t, tc, 2, withEnv)
 
 	t.Logf("%s: checking installation state after app deployment", time.Now().Format(time.RFC3339))
 	line = []string{"check-airgap-installation-state.sh", initialVersion, k8sVersionPreviousStable()}
@@ -1926,15 +1845,15 @@ func TestMultiNodeAirgapHAInstallation(t *testing.T) {
 	}
 
 	// join a worker
-	joinWorkerNodeWithOptions(t, tc, 1, joinOptions{isAirgap: true})
+	joinWorkerNode(t, tc, 1)
 	checkWorkerProfile(t, tc, 1)
 
 	// join a controller
-	joinControllerNodeWithOptions(t, tc, 2, joinOptions{isAirgap: true})
+	joinControllerNode(t, tc, 2)
 	checkWorkerProfile(t, tc, 2)
 
 	// join another controller in HA mode
-	joinControllerNodeWithOptions(t, tc, 3, joinOptions{isAirgap: true, isHA: true})
+	joinControllerNodeWithOptions(t, tc, 3, joinOptions{isHA: true})
 	checkWorkerProfile(t, tc, 3)
 
 	// wait for the nodes to report as ready.
@@ -2198,48 +2117,48 @@ func TestFiveNodesAirgapUpgrade(t *testing.T) {
 
 	// generate controller node join command.
 	t.Logf("%s: generating a new controller token command", time.Now().Format(time.RFC3339))
-	stdout, stderr, err := tc.RunPlaywrightTest("get-join-controller-command")
+	stdout, stderr, err := tc.RunPlaywrightTest("get-join-controller-commands")
 	if err != nil {
 		t.Fatalf("fail to generate controller join token:\nstdout: %s\nstderr: %s", stdout, stderr)
 	}
-	controllerCommand, err := findJoinCommandInOutput(stdout)
+	controllerCommands, err := findJoinCommandsInOutput(stdout)
 	if err != nil {
 		t.Fatalf("fail to find the join command in the output: %v", err)
 	}
-	t.Log("controller join token command:", controllerCommand)
+	t.Log("controller join commands:", controllerCommands)
 
 	// bypass ha prompt
-	controllerCommand = strings.Replace(controllerCommand, "join", "join --no-ha", 1)
+	for i := range controllerCommands {
+		controllerCommands[i] = strings.Replace(controllerCommands[i], "join", "join --no-ha", 1)
+	}
 
-	// join the controller nodes
-	joinCommandsSequence := [][]string{
-		{"rm", "/assets/ec-release-upgrade.tgz"},
-		{"airgap-prepare.sh"},
-		strings.Split(controllerCommand, " "),
-		{"rm", "/assets/release.airgap"},
-		{"rm", "/usr/local/bin/embedded-cluster"},
+	joinCommands := [][]string{}
+	for _, command := range controllerCommands {
+		joinCommands = append(joinCommands, []string{command})
 	}
+
+	// join the controller nodes
 	runInParallelOffset(t, time.Second*30,
 		func(t *testing.T) error {
-			err := tc.RunCommandsOnNode(1, joinCommandsSequence)
+			err := tc.RunCommandsOnNode(1, joinCommands)
 			if err != nil {
 				return fmt.Errorf("unable to join node 1: %w", err)
 			}
 			return nil
 		}, func(t *testing.T) error {
-			err := tc.RunCommandsOnNode(2, joinCommandsSequence)
+			err := tc.RunCommandsOnNode(2, joinCommands)
 			if err != nil {
 				return fmt.Errorf("unable to join node 2: %w", err)
 			}
 			return nil
 		}, func(t *testing.T) error {
-			err := tc.RunCommandsOnNode(3, joinCommandsSequence)
+			err := tc.RunCommandsOnNode(3, joinCommands)
 			if err != nil {
 				return fmt.Errorf("unable to join node 3: %w", err)
 			}
 			return nil
 		}, func(t *testing.T) error {
-			err := tc.RunCommandsOnNode(4, joinCommandsSequence)
+			err := tc.RunCommandsOnNode(4, joinCommands)
 			if err != nil {
 				return fmt.Errorf("unable to join node 4: %w", err)
 			}

e2e/playwright/tests/deploy-ec18-app-version/test.spec.ts renamed to e2e/playwright/tests/deploy-ec18-app/test.spec.ts

@@ -1,8 +1,8 @@
 import { test, expect } from '@playwright/test';
-import { login, deployEC18AppVersion } from '../shared';
+import { login, deployEC18App } from '../shared';
 
 test('deploy ec18 app version', async ({ page }) => {
   test.setTimeout(2 * 60 * 1000); // 2 minutes
   await login(page);
-  await deployEC18AppVersion(page, expect);
+  await deployEC18App(page, expect);
 });

e2e/playwright/tests/deploy-ec23-app/test.spec.ts

@@ -0,0 +1,8 @@
+import { test, expect } from '@playwright/test';
+import { login, deployEC23App } from '../shared';
+
+test('deploy ec23 app', async ({ page }) => {
+  test.setTimeout(2 * 60 * 1000); // 2 minutes
+  await login(page);
+  await deployEC23App(page, expect);
+});

e2e/playwright/tests/get-ec18-join-worker-command/test.spec.ts

@@ -1,7 +1,7 @@
 import { test, expect } from '@playwright/test';
 import { login } from '../shared';
 
-test('get join worker command', async ({ page }) => {
+test('get ec18 join worker command', async ({ page }) => {
   await login(page);
   await page.locator('.NavItem').getByText('Cluster Management', { exact: true }).click();
   await page.getByRole('button', { name: 'Add node', exact: true }).click();

e2e/playwright/tests/get-join-worker-command/test.spec.ts renamed to e2e/playwright/tests/get-ec23-join-worker-command/test.spec.ts

@@ -1,7 +1,7 @@
 import { test, expect } from '@playwright/test';
 import { login } from '../shared';
 
-test('get join worker command', async ({ page }) => {
+test('get ec23 join worker command', async ({ page }) => {
   await login(page);
   await page.locator('.NavItem').getByText('Cluster Management', { exact: true }).click();
   await page.getByRole('button', { name: 'Add node', exact: true }).click();
@@ -15,4 +15,4 @@ test('get join worker command', async ({ page }) => {
   await expect(page.locator('#controller-testNodeType')).not.toBeChecked();
   const joinCommand = await page.locator('.react-prism.language-bash').first().textContent();
   console.log(`{"command":"${joinCommand}"}`);
-});
+});

e2e/playwright/tests/get-join-controller-command/test.spec.ts renamed to e2e/playwright/tests/get-join-controller-commands/test.spec.ts

@@ -1,14 +1,16 @@
 import { test, expect } from '@playwright/test';
 import { login } from '../shared';
 
-test('get join controller command', async ({ page }) => {
+test('get join controller commands', async ({ page }) => {
   await login(page);
   await page.locator('.NavItem').getByText('Cluster Management', { exact: true }).click();
   await page.getByRole('button', { name: 'Add node', exact: true }).click();
   await expect(page.locator('.Modal-body')).toBeVisible();
   await expect(page.getByRole('heading')).toContainText('Add a Node');
   await expect(page.getByText('Roles:')).toBeVisible();
   await expect(page.locator('#controller-testNodeType')).toBeChecked();
-  const joinCommand = await page.locator('.react-prism.language-bash').first().textContent();
-  console.log(`{"command":"${joinCommand}"}`);
+  const joinCommand1 = await page.locator('.react-prism.language-bash').nth(0).textContent();
+  const joinCommand2 = await page.locator('.react-prism.language-bash').nth(1).textContent();
+  const joinCommand3 = await page.locator('.react-prism.language-bash').nth(2).textContent();
+  console.log(JSON.stringify({commands: [joinCommand1, joinCommand2, joinCommand3]}));
 });

e2e/playwright/tests/get-join-worker-commands/test.spec.ts

@@ -0,0 +1,20 @@
+import { test, expect } from '@playwright/test';
+import { login } from '../shared';
+
+test('get join worker commands', async ({ page }) => {
+  await login(page);
+  await page.locator('.NavItem').getByText('Cluster Management', { exact: true }).click();
+  await page.getByRole('button', { name: 'Add node', exact: true }).click();
+  await expect(page.locator('.Modal-body')).toBeVisible();
+  await expect(page.getByRole('heading')).toContainText('Add a Node');
+  await expect(page.getByText('Roles:')).toBeVisible();
+  await expect(page.locator('#controller-testNodeType')).toBeChecked();
+  await page.locator('.nodeType-selector').getByText('controller-test').click()
+  await page.locator('.nodeType-selector').getByText('abc').click()
+  await expect(page.locator('#abcNodeType')).toBeChecked();
+  await expect(page.locator('#controller-testNodeType')).not.toBeChecked();
+  const joinCommand1 = await page.locator('.react-prism.language-bash').nth(0).textContent();
+  const joinCommand2 = await page.locator('.react-prism.language-bash').nth(1).textContent();
+  const joinCommand3 = await page.locator('.react-prism.language-bash').nth(2).textContent();
+  console.log(JSON.stringify({commands: [joinCommand1, joinCommand2, joinCommand3]}));
+});