Fix sequences in regression tests (#5181)

* Fix sequences in regression tests

* updates

Author: sgalsaleh

e2e/playwright/regression/@existing-online-install-admin/test.spec.ts

@@ -74,19 +74,19 @@ test('type=existing cluster, env=online, phase=new install, rbac=cluster admin',
   await page.getByRole('button', { name: 'Deploy', exact: true }).first().click();
   await validateIgnorePreflightsModal(page, expect);
   await validateVersionHistoryAutomaticUpdates(page, expect);
-  await validateCurrentVersionCard(page, expect, "1.0.0", 0);
+  await validateCurrentVersionCard(page, expect, 1);
   await validateCurrentReleaseNotes(page, expect, "release notes - updates");
   await validateCurrentClusterAdminPreflights(page, expect);
   await validateCurrentDeployLogs(page, expect);
   await validateConfigView(page, expect);
-  await validateVersionHistoryRows(page, expect, true);
+  await validateVersionHistoryRows(page, expect, constants.IS_AIRGAPPED);
   await deployNewVersion(page, expect, 2, 'Config Change', false);
 
   // License validation
   await validateCurrentLicense(page, expect, constants.CUSTOMER_NAME, constants.CHANNEL_NAME, constants.IS_AIRGAP_SUPPORTED, constants.IS_EC);
   const newIntEntitlement = await updateOnlineLicense(page, constants.CUSTOMER_ID, constants.CUSTOMER_NAME, constants.CHANNEL_ID, constants.IS_AIRGAP_SUPPORTED, constants.IS_EC);
   await validateUpdatedLicense(page, expect, newIntEntitlement);
-  await validateVersionDiff(page, expect, 2, 1);
+  await validateVersionDiff(page, expect, 3, 2);
   await deployNewVersion(page, expect, 3, 'License Change', false);
 
   // Snapshot validation
@@ -96,14 +96,14 @@ test('type=existing cluster, env=online, phase=new install, rbac=cluster admin',
 
   // App snapshot workflow
   await createAppSnapshot(page, expect);
-  await rollbackToVersion(page, expect, 1, 1);
-  await restoreAppSnapshot(page, expect, 0, 2, true);
+  await rollbackToVersion(page, expect, 1, 2);
+  await restoreAppSnapshot(page, expect, 0, 3, true);
   await deleteAppSnapshot(page, expect);
 
   // Full snapshot workflow
   await createFullSnapshot(page, expect);
-  await rollbackToVersion(page, expect, 1, 1);
-  await restoreFullSnapshot(page, expect, 0, 2, true, constants.IS_AIRGAPPED);
+  await rollbackToVersion(page, expect, 1, 2);
+  await restoreFullSnapshot(page, expect, 0, 3, true, constants.IS_AIRGAPPED);
   await deleteFullSnapshot(page, expect);
 
   // Other validation

e2e/playwright/regression/@existing-online-install-minimal/test.spec.ts

@@ -69,20 +69,20 @@ test('type=existing cluster, env=online, phase=new install, rbac=minimal rbac',
 
   // Config update and version history checks
   await updateConfig(page, expect);
-  await validateVersionMinimalRBACPreflights(page, expect, 0, 1);
+  await validateVersionMinimalRBACPreflights(page, expect, 0, 2);
   await validateVersionHistoryAutomaticUpdates(page, expect);
-  await validateCurrentVersionCard(page, expect, "1.0.0", 0);
+  await validateCurrentVersionCard(page, expect, 1);
   await validateCurrentReleaseNotes(page, expect, "release notes - updates");
   await validateCurrentDeployLogs(page, expect);
   await validateConfigView(page, expect);
-  await validateVersionHistoryRows(page, expect, true);
+  await validateVersionHistoryRows(page, expect, constants.IS_AIRGAPPED);
   await deployNewVersion(page, expect, 2, 'Config Change', true);
 
   // License validation
   await validateCurrentLicense(page, expect, constants.CUSTOMER_NAME, constants.CHANNEL_NAME, constants.IS_AIRGAP_SUPPORTED, constants.IS_EC);
   const newIntEntitlement = await updateOnlineLicense(page, constants.CUSTOMER_ID, constants.CUSTOMER_NAME, constants.CHANNEL_ID, constants.IS_AIRGAP_SUPPORTED, constants.IS_EC);
   await validateUpdatedLicense(page, expect, newIntEntitlement);
-  await validateVersionDiff(page, expect, 2, 1);
+  await validateVersionDiff(page, expect, 3, 2);
   await deployNewVersion(page, expect, 3, 'License Change', true);
 
   // Snapshot validation
@@ -93,13 +93,13 @@ test('type=existing cluster, env=online, phase=new install, rbac=minimal rbac',
 
   // App snapshot workflow
   await createAppSnapshot(page, expect);
-  await rollbackToVersion(page, expect, 1, 1);
+  await rollbackToVersion(page, expect, 1, 2);
   await restoreAppSnapshot(page, expect, 0, 2, true);
   await deleteAppSnapshot(page, expect);
 
   // Full snapshot workflow
   await createFullSnapshot(page, expect);
-  await rollbackToVersion(page, expect, 1, 1);
+  await rollbackToVersion(page, expect, 1, 2);
   await restoreFullSnapshot(page, expect, 0, 2, true, constants.IS_AIRGAPPED);
   await deleteFullSnapshot(page, expect);
 

e2e/playwright/regression/shared/license.ts

@@ -75,7 +75,6 @@ export async function validateUpdatedLicense(page: Page, expect: Expect, newIntE
   await expect(updatesCard).toBeVisible();
   const updateRow = updatesCard.getByTestId('version-history-row-0');
   await expect(updateRow).toBeVisible();
-  await expect(updateRow).toContainText('1.0.0');
   await expect(updateRow).toContainText('License Change');
-  await expect(updateRow).toContainText('Sequence 2');
+  await expect(updateRow).toContainText('Sequence 3');
 };

e2e/playwright/regression/shared/version-history.ts

@@ -7,10 +7,9 @@ import {
   validateMinimalRBACPreflightsPage
 } from './preflights';
 
-export const validateCurrentVersionCard = async (page: Page, expect: Expect, versionLabel: string, sequence: number) => {
+export const validateCurrentVersionCard = async (page: Page, expect: Expect, sequence: number) => {
   const currentVersionCard = page.getByTestId("current-version-card");
   await expect(currentVersionCard).toBeVisible();
-  await expect(currentVersionCard).toContainText(versionLabel);
   await expect(currentVersionCard).toContainText(`Sequence ${sequence}`);
 };
 
@@ -83,16 +82,15 @@ export const validateVersionHistoryAutomaticUpdates = async (page: Page, expect:
   await expect(automaticUpdatesModal).not.toBeVisible();
 };
 
-export const validateVersionHistoryRows = async (page: Page, expect: Expect, isOnline: boolean) => {
+export const validateVersionHistoryRows = async (page: Page, expect: Expect, isAirgapped: boolean) => {
   await page.getByRole('link', { name: 'Version history', exact: true }).click();
 
   const updatesCard = page.getByTestId('available-updates-card');
   await expect(updatesCard).toBeVisible();
 
   const updateRow = updatesCard.getByTestId('version-history-row-0');
   await expect(updateRow).toBeVisible();
-  await expect(updateRow).toContainText('1.0.0');
-  await expect(updateRow).toContainText('Sequence 1');
+  await expect(updateRow).toContainText('Sequence 2');
   await expect(updateRow).toContainText('Config Change');
   await expect(updateRow).toContainText('View diff');
   await expect(updateRow.getByRole('button', { name: 'Deploy', exact: true })).toBeVisible();
@@ -102,19 +100,24 @@ export const validateVersionHistoryRows = async (page: Page, expect: Expect, isO
 
   const firstRow = allVersionsCard.getByTestId("version-history-row-0");
   await expect(firstRow).toBeVisible();
-  await expect(firstRow).toContainText('1.0.0');
-  await expect(firstRow).toContainText('Sequence 1');
+  await expect(firstRow).toContainText('Sequence 2');
   await expect(firstRow).toContainText('Config Change');
   await expect(firstRow).toContainText('View diff');
   await expect(firstRow.getByRole('button', { name: 'Deploy', exact: true })).toBeVisible();
 
   const secondRow = allVersionsCard.getByTestId("version-history-row-1");
   await expect(secondRow).toBeVisible();
-  await expect(secondRow).toContainText('1.0.0');
-  await expect(secondRow).toContainText('Sequence 0');
-  await expect(secondRow).toContainText(isOnline ? 'Online Install' : 'Airgap Install');
+  await expect(secondRow).toContainText('Sequence 1');
+  await expect(secondRow).toContainText(isAirgapped ? 'Airgap Update' : 'Upstream Update');
   await expect(secondRow).toContainText('Currently deployed version');
   await expect(secondRow.getByRole('button', { name: 'Redeploy', exact: true })).toBeVisible();
+
+  const thirdRow = allVersionsCard.getByTestId("version-history-row-1");
+  await expect(thirdRow).toBeVisible();
+  await expect(thirdRow).toContainText('Sequence 0');
+  await expect(thirdRow).toContainText(isAirgapped ? 'Airgap Install' : 'Online Install');
+  await expect(thirdRow).toContainText('Currently deployed version');
+  await expect(thirdRow.getByRole('button', { name: 'Redeploy', exact: true })).toBeVisible();
 };
 
 export const deployNewVersion = async (page: Page, expect: Expect, expectedSequence: number, expectedSource: string, isMinimalRBAC: boolean, skipNavigation: boolean = false) => {