chore(ci): fix regression tests (#5686)

* chore(ci): fix regression tests

* f

* f

* f

* f

* f

* f

* f

* f

* f

* f

* f

* f

Author: emosbaugh

.github/workflows/regression.yaml

@@ -181,13 +181,15 @@ jobs:
             id: "embedded-airgapped-install",
             name: "type=embedded cluster, env=airgapped, phase=new install, rbac=cluster admin",
             backend_config: "embedded-airgapped-install-backend-config.tfvars",
-            terraform_script: "embedded-airgapped-install.sh"
+            terraform_script: "embedded-airgapped-install.sh",
+            is_upgrade: "0"
           },
           {
             id: "embedded-online-install",
             name: "type=embedded cluster, env=online, phase=new install, rbac=cluster admin",
             backend_config: "embedded-online-install-backend-config.tfvars",
-            terraform_script: "embedded-online-install.sh"
+            terraform_script: "embedded-online-install.sh",
+            is_upgrade: "0"
           },
           # NOTE (@salah): decided not to port this test to playwright
           # {
@@ -201,13 +203,15 @@ jobs:
             id: "existing-airgapped-install-admin",
             name: "type=existing cluster, env=airgapped, phase=new install, rbac=cluster admin",
             backend_config: "existing-airgapped-install-admin-backend-config.tfvars",
-            terraform_script: "existing-airgapped-install-admin.sh"
+            terraform_script: "existing-airgapped-install-admin.sh",
+            is_upgrade: "0"
           },
           {
             id: "existing-airgapped-install-minimum",
             name: "type=existing cluster, env=airgapped, phase=new install, rbac=minimal rbac",
             backend_config: "existing-airgapped-install-minimum-backend-config.tfvars",
-            terraform_script: "existing-airgapped-install-minimum.sh"
+            terraform_script: "existing-airgapped-install-minimum.sh",
+            is_upgrade: "0"
           },
           {
             id: "existing-online-upgrade-admin",
@@ -227,13 +231,15 @@ jobs:
             id: "existing-online-install-admin",
             name: "type=existing cluster, env=online, phase=new install, rbac=cluster admin",
             backend_config: "existing-online-install-admin-backend-config.tfvars",
-            terraform_script: "existing-online-install-admin.sh"
+            terraform_script: "existing-online-install-admin.sh",
+            is_upgrade: "0"
           },
           {
             id: "existing-online-install-minimum",
             name: "type=existing cluster, env=online, phase=new install, rbac=minimal rbac",
             backend_config: "existing-online-install-minimum-backend-config.tfvars",
-            terraform_script: "existing-online-install-minimum.sh"
+            terraform_script: "existing-online-install-minimum.sh",
+            is_upgrade: "0"
           },
           {
             id: "existing-airgapped-upgrade-admin",
@@ -254,7 +260,8 @@ jobs:
           #   id: "helmvm-online-install",
           #   name: "type=helmvm cluster, env=online, phase=new install, rbac=cluster admin",
           #   backend_config: "helmvm-online-install-backend-config.tfvars",
-          #   terraform_script: "helmvm-online-install.sh"
+          #   terraform_script: "helmvm-online-install.sh",
+          #   is_upgrade: "0"
           # }
         ]
     steps:
@@ -286,7 +293,7 @@ jobs:
           export CURRENT_TAG="${{ github.event.inputs.version_tag_old || inputs.version_tag_old }}"
           export NEXT_TAG="${{ github.event.inputs.version_tag_new || inputs.version_tag_new }}"
 
-          if [ -n "${{ matrix.test.is_upgrade }}" ]; then
+          if [ "${{ matrix.test.is_upgrade }}" == "1" ]; then
             export TF_VAR_kots_version_initial="${CURRENT_TAG:1}"
             export TF_VAR_kots_version_upgrade="${NEXT_TAG:1}"
           else

e2e/playwright/regression/shared/api.ts

@@ -107,6 +107,7 @@ export async function updateIdentityServiceOktaApp(oktaDomain: string, oktaAppId
   }
 
   const app = await response.json();
+
   app.settings.oauthClient.redirect_uris = [`${process.env.BASE_URL}/dex/callback`];
   app.settings.oauthClient.post_logout_redirect_uris = [process.env.BASE_URL];
 

e2e/playwright/regression/shared/constants.ts

@@ -10,8 +10,8 @@ export const INITIAL_VERSION_BUNDLE_PATH = "./initial-app-release.airgap";
 export const NEW_VERSION_BUNDLE_PATH = "./new-app-release.airgap";
 export const SNAPSHOTS_HOST_PATH = "/tmp/hostpath-for-snapshots";
 export const IDENTITY_SERVICE_OKTA_USERNAME = "salah+testim.identity.service@replicated.com";
-export const IDENTITY_SERVICE_OKTA_APP_ID = "0oa6s7995wt2UIQoR5d7";
-export const IDENTITY_SERVICE_OKTA_CLIENT_ID = "0oa6s7995wt2UIQoR5d7";
-export const IDENTITY_SERVICE_OKTA_DOMAIN = "dev-88212807.okta.com";
+export const IDENTITY_SERVICE_OKTA_APP_ID = "0oaxgqkqeeIy2xNpL697";
+export const IDENTITY_SERVICE_OKTA_CLIENT_ID = "0oaxgqkqeeIy2xNpL697";
+export const IDENTITY_SERVICE_OKTA_DOMAIN = "integrator-1122339.okta.com";
 export const SSH_TO_JUMPBOX = `ssh ubuntu@${process.env.JUMPBOX_PRIVATE_IP}`;
 export const SSH_TO_WORKER = `ssh ubuntu@${process.env.WORKER_PRIVATE_IP}`;

e2e/playwright/regression/shared/identity-service.ts

@@ -23,7 +23,7 @@ export const validateIdentityService = async (page: Page, expect: Expect, namesp
   await openidRadio.click();
 
   await identityProviderForm.getByTestId('connector-name-input').fill('Okta');
-  await identityProviderForm.getByTestId('issuer-input').fill('https://' + IDENTITY_SERVICE_OKTA_DOMAIN);
+  await identityProviderForm.getByTestId('issuer-input').fill(`https://${IDENTITY_SERVICE_OKTA_DOMAIN}/oauth2/default`);
   await identityProviderForm.getByTestId('client-id-input').fill(IDENTITY_SERVICE_OKTA_CLIENT_ID);
   await identityProviderForm.getByTestId('client-secret-input').fill(process.env.IDENTITY_SERVICE_OKTA_CLIENT_SECRET!);
 
@@ -47,9 +47,11 @@ export const validateIdentityService = async (page: Page, expect: Expect, namesp
   await page.getByText('Log in with Okta').click();
   await page.locator('input[name="identifier"]').click();
   await page.locator('input[name="identifier"]').fill(IDENTITY_SERVICE_OKTA_USERNAME);
+  await page.locator('input[type="submit"]').click(); // Next button
+
   await page.locator('input[name="credentials.passcode"]').click();
   await page.locator('input[name="credentials.passcode"]').fill(process.env.IDENTITY_SERVICE_OKTA_PASSWORD!);
-  await page.locator('input[type="submit"]').click();
+  await page.locator('input[type="submit"]').click(); // Verify button
 
   await validateDashboardInfo(page, expect, isAirgapped);
 

web/src/components/identity/IdentityProviders.jsx

@@ -657,6 +657,7 @@ class IdentityProviders extends Component {
                   <input
                     type="text"
                     className="Input u-marginTop--12"
+                    data-testid="admin-console-address-input"
                     placeholder="https://kots.somebigbankadmin.com"
                     value={this.state.adminConsoleAddress}
                     disabled={syncAppWithGlobal}
@@ -689,6 +690,7 @@ class IdentityProviders extends Component {
                     <input
                       type="text"
                       className="Input u-marginTop--12"
+                      data-testid="identity-service-address-input"
                       placeholder="https://kots.somebigbankadmin.com/dex"
                       value={this.state.identityServiceAddress}
                       disabled={syncAppWithGlobal}