test(e2e): upgrade existing rhdh release deployed via operator to new version

.gitignore

@@ -63,3 +63,5 @@ dynamic-plugins-root/*
 
 # Private Keys
 *.pem
+
+e2e-tests/operator-project

e2e-tests/playwright.config.ts

@@ -63,6 +63,7 @@ export default defineConfig({
         "**/playwright/e2e/configuration-test/config-map.spec.ts",
         "**/playwright/e2e/plugins/tekton/tekton.spec.ts",
         "**/playwright/e2e/audit-log/**/*.spec.ts",
+        "**/playwright/e2e/operator/**/*.spec.ts",
       ],
     },
     {
@@ -81,6 +82,7 @@ export default defineConfig({
         "**/playwright/e2e/authProviders/setup-environment.spec.ts",
         "**/playwright/e2e/authProviders/clear-environment.spec.ts",
         "**/playwright/e2e/verify-tls-config-health-check.spec.ts",
+        "**/playwright/e2e/operator/**/*.spec.ts",
       ],
       dependencies: ["showcase-auth-providers-setup-environment"],
       teardown: "showcase-auth-providers-clear-environment",
@@ -112,6 +114,7 @@ export default defineConfig({
         "**/playwright/e2e/verify-redis-cache.spec.ts",
         "**/playwright/e2e/verify-tls-config-health-check.spec.ts",
         "**/playwright/e2e/configuration-test/config-map.spec.ts",
+        "**/playwright/e2e/operator/**/*.spec.ts",
       ],
     },
     {

e2e-tests/playwright/data/backstage-operator.yaml

@@ -0,0 +1,16 @@
+apiVersion: rhdh.redhat.com/v1alpha3
+kind: Backstage
+metadata:
+  name: developer-hub
+  namespace: rhdh-operator
+spec:
+  application:
+    appConfig:
+      mountPath: /opt/app-root/src
+    extraFiles:
+      mountPath: /opt/app-root/src
+    replicas: 1
+    route:
+      enabled: true
+  database:
+    enableLocalDb: true

e2e-tests/playwright/e2e/audit-log/catalog.spec.ts

@@ -1,11 +1,11 @@
 import { test } from "@playwright/test";
 import { Common } from "../../utils/common";
-import { UIhelper } from "../../utils/ui-helper";
+import { UiHelper } from "../../utils/ui-helper";
 import { LogUtils } from "./log-utils";
 import { CatalogImport } from "../../support/pages/catalog-import";
 
 test.describe("Audit Log check for Catalog Plugin", () => {
-  let uiHelper: UIhelper;
+  let uiHelper: UiHelper;
   let common: Common;
   let catalogImport: CatalogImport;
   let baseApiUrl: string;
@@ -16,7 +16,7 @@ test.describe("Audit Log check for Catalog Plugin", () => {
   });
 
   test.beforeEach(async ({ page }) => {
-    uiHelper = new UIhelper(page);
+    uiHelper = new UiHelper(page);
     common = new Common(page);
     catalogImport = new CatalogImport(page);
     await common.loginAsGuest();

e2e-tests/playwright/e2e/audit-log/log-utils.ts

@@ -1,6 +1,7 @@
 import { expect } from "@playwright/test";
 import { execFile } from "child_process";
 import { Log } from "./logs";
+import { LOGGER } from "../../utils/logger";
 
 export class LogUtils {
   /**
@@ -198,7 +199,7 @@ export class LogUtils {
       await LogUtils.executeCommand(command, args);
       console.log("Login successful.");
     } catch (error) {
-      console.error("Error during login:", error);
+      LOGGER.error("Error during login:", error);
       throw new Error(`Failed to login to OpenShift: ${error}`);
     }
   }

e2e-tests/playwright/e2e/audit-log/scaffold.spec.ts

@@ -1,11 +1,11 @@
 import { test } from "@playwright/test";
 import { Common } from "../../utils/common";
-import { UIhelper } from "../../utils/ui-helper";
+import { UiHelper } from "../../utils/ui-helper";
 import { LogUtils } from "./log-utils";
 import { CatalogImport } from "../../support/pages/catalog-import";
 
 test.describe("Audit Log check for Catalog Plugin", () => {
-  let uiHelper: UIhelper;
+  let uiHelper: UiHelper;
   let common: Common;
   let catalogImport: CatalogImport;
   const template =
@@ -18,7 +18,7 @@ test.describe("Audit Log check for Catalog Plugin", () => {
 
   // Common setup before each test
   test.beforeEach(async ({ page }) => {
-    uiHelper = new UIhelper(page);
+    uiHelper = new UiHelper(page);
     common = new Common(page);
     catalogImport = new CatalogImport(page);
     await common.loginAsGuest();

e2e-tests/playwright/e2e/authProviders/basic-authentication.spec.ts

@@ -1,6 +1,6 @@
 import { test, Page, expect } from "@playwright/test";
 import { Common, setupBrowser } from "../../utils/common";
-import { UIhelper } from "../../utils/ui-helper";
+import { UiHelper } from "../../utils/ui-helper";
 import * as constants from "../../utils/authenticationProviders/constants";
 import { dumpAllPodsLogs, dumpRHDHUsersAndGroups } from "../../utils/helper";
 import { APIHelper } from "../../utils/api-helper";
@@ -13,13 +13,13 @@ test.describe("Standard authentication providers: Basic authentication", () => {
   test.use({ baseURL: constants.AUTH_PROVIDERS_BASE_URL });
 
   let common: Common;
-  let uiHelper: UIhelper;
+  let uiHelper: UiHelper;
 
   test.beforeAll(async ({ browser }, testInfo) => {
     test.setTimeout(120 * 1000);
     page = (await setupBrowser(browser, testInfo)).page;
     common = new Common(page);
-    uiHelper = new UIhelper(page);
+    uiHelper = new UiHelper(page);
     expect(process.env.BASE_URL).not.toBeNull();
     LOGGER.info(`Base Url is ${process.env.BASE_URL}`);
     LOGGER.info(

e2e-tests/playwright/e2e/authProviders/github-provider.spec.ts

@@ -1,6 +1,6 @@
 import { test, Page, expect } from "@playwright/test";
 import { Common, setupBrowser } from "../../utils/common";
-import { UIhelper } from "../../utils/ui-helper";
+import { UiHelper } from "../../utils/ui-helper";
 import * as constants from "../../utils/authenticationProviders/constants";
 import { LOGGER } from "../../utils/logger";
 import {
@@ -26,7 +26,7 @@ test.describe("Standard authentication providers: Github Provider", () => {
 
   let common: Common;
   let context: BrowserContext;
-  let uiHelper: UIhelper;
+  let uiHelper: UiHelper;
   let mustSync = false;
   const syncTime = 60;
 
@@ -36,7 +36,7 @@ test.describe("Standard authentication providers: Github Provider", () => {
     page = browserSetup.page;
     context = browserSetup.context;
     common = new Common(page);
-    uiHelper = new UIhelper(page);
+    uiHelper = new UiHelper(page);
     expect(process.env.BASE_URL).not.toBeNull();
     expect(process.env.AUTH_PROVIDERS_GH_USER_2FA).not.toBeNull();
     expect(process.env.AUTH_PROVIDERS_GH_ADMIN_2FA).not.toBeNull();

e2e-tests/playwright/e2e/authProviders/microsoft-provider.spec.ts

@@ -1,6 +1,6 @@
 import { test, Page, expect } from "@playwright/test";
 import { Common, setupBrowser } from "../../utils/common";
-import { UIhelper } from "../../utils/ui-helper";
+import { UiHelper } from "../../utils/ui-helper";
 import UserRepresentation from "@keycloak/keycloak-admin-client/lib/defs/userRepresentation";
 import * as constants from "../../utils/authenticationProviders/constants";
 import { LOGGER } from "../../utils/logger";
@@ -27,7 +27,7 @@ test.describe("Standard authentication providers: Micorsoft Azure EntraID", () =
   test.use({ baseURL: constants.AUTH_PROVIDERS_BASE_URL });
   let common: Common;
   let context: BrowserContext;
-  let uiHelper: UIhelper;
+  let uiHelper: UiHelper;
   let usersCreated: Map<string, UserRepresentation>;
   let groupsCreated: Map<string, GroupRepresentation>;
   const syncTime = 60;
@@ -43,7 +43,7 @@ test.describe("Standard authentication providers: Micorsoft Azure EntraID", () =
     page = browserSetup.page;
     context = browserSetup.context;
     common = new Common(page);
-    uiHelper = new UIhelper(page);
+    uiHelper = new UiHelper(page);
     expect(process.env.BASE_URL).not.toBeNull();
     expect(constants.AUTH_PROVIDERS_BASE_URL).not.toBeNull();
     expect(constants.AUTH_PROVIDERS_NAMESPACE).not.toBeNull();

e2e-tests/playwright/e2e/authProviders/rhsso-76-provider.spec.ts

@@ -1,6 +1,6 @@
 import { test, Page, expect } from "@playwright/test";
 import { Common, setupBrowser } from "../../utils/common";
-import { UIhelper } from "../../utils/ui-helper";
+import { UiHelper } from "../../utils/ui-helper";
 import UserRepresentation from "@keycloak/keycloak-admin-client/lib/defs/userRepresentation";
 import * as constants from "../../utils/authenticationProviders/constants";
 import { LOGGER } from "../../utils/logger";
@@ -24,7 +24,7 @@ for (const version of ["RHBK"]) {
     test.use({ baseURL: constants.AUTH_PROVIDERS_BASE_URL });
 
     let common: Common;
-    let uiHelper: UIhelper;
+    let uiHelper: UiHelper;
     let usersCreated: Map<string, UserRepresentation>;
     let groupsCreated: Map<string, GroupRepresentation>;
     const syntTime = 60;
@@ -73,7 +73,7 @@ for (const version of ["RHBK"]) {
 
       page = (await setupBrowser(browser, testInfo)).page;
       common = new Common(page);
-      uiHelper = new UIhelper(page);
+      uiHelper = new UiHelper(page);
 
       if (version == "RHSSO") {
         helmParams = [];

e2e-tests/playwright/e2e/catalog-scaffolded-from-link.spec.ts

@@ -1,5 +1,5 @@
 import { expect, Page, test } from "@playwright/test";
-import { UIhelper } from "../utils/ui-helper";
+import { UiHelper } from "../utils/ui-helper";
 import { Common, setupBrowser } from "../utils/common";
 import { CatalogImport } from "../support/pages/catalog-import";
 import { APIHelper } from "../utils/api-helper";
@@ -8,7 +8,7 @@ import { GITHUB_API_ENDPOINTS } from "../utils/api-endpoints";
 let page: Page;
 
 test.describe.serial("Link Scaffolded Templates to Catalog Items", () => {
-  let uiHelper: UIhelper;
+  let uiHelper: UiHelper;
   let common: Common;
   let catalogImport: CatalogImport;
 
@@ -31,7 +31,7 @@ test.describe.serial("Link Scaffolded Templates to Catalog Items", () => {
     page = (await setupBrowser(browser, testInfo)).page;
 
     common = new Common(page);
-    uiHelper = new UIhelper(page);
+    uiHelper = new UiHelper(page);
     catalogImport = new CatalogImport(page);
 
     await common.loginAsGuest();

e2e-tests/playwright/e2e/catalog-timestamp.spec.ts

@@ -1,12 +1,12 @@
 import { Page, expect, test } from "@playwright/test";
-import { UIhelper } from "../utils/ui-helper";
+import { UiHelper } from "../utils/ui-helper";
 import { Common, setupBrowser } from "../utils/common";
 import { CatalogImport } from "../support/pages/catalog-import";
 import { UI_HELPER_ELEMENTS } from "../support/pageObjects/global-obj";
 
 let page: Page;
 test.describe("Test timestamp column on Catalog", () => {
-  let uiHelper: UIhelper;
+  let uiHelper: UiHelper;
   let common: Common;
   let catalogImport: CatalogImport;
 
@@ -17,7 +17,7 @@ test.describe("Test timestamp column on Catalog", () => {
     page = (await setupBrowser(browser, testInfo)).page;
 
     common = new Common(page);
-    uiHelper = new UIhelper(page);
+    uiHelper = new UiHelper(page);
     catalogImport = new CatalogImport(page);
 
     await common.loginAsGuest();

e2e-tests/playwright/e2e/configuration-test/config-map.spec.ts

@@ -2,7 +2,7 @@ import { test, expect } from "@playwright/test";
 import { KubeClient } from "../../utils/kube-client";
 import { LOGGER } from "../../utils/logger";
 import { Common } from "../../utils/common";
-import { UIhelper } from "../../utils/ui-helper";
+import { UiHelper } from "../../utils/ui-helper";
 
 test.describe.skip("Change app-config at e2e test runtime", () => {
   test("Verify title change after ConfigMap modification", async ({ page }) => {
@@ -14,7 +14,7 @@ test.describe.skip("Change app-config at e2e test runtime", () => {
 
     const kubeUtils = new KubeClient();
     const dynamicTitle = generateDynamicTitle();
-    const uiHelper = new UIhelper(page);
+    const uiHelper = new UiHelper(page);
     try {
       LOGGER.info(`Updating ConfigMap '${configMapName}' with new title.`);
       await kubeUtils.updateConfigMapTitle(
@@ -33,7 +33,7 @@ test.describe.skip("Change app-config at e2e test runtime", () => {
       await page.context().clearPermissions();
       await page.reload({ waitUntil: "domcontentloaded" });
       await common.loginAsGuest();
-      await new UIhelper(page).openSidebar("Home");
+      await new UiHelper(page).openSidebar("Home");
       await uiHelper.verifyHeading("Welcome back!");
       await uiHelper.verifyText("Quick Access");
       await expect(page.locator("#search-bar-text-field")).toBeVisible();

e2e-tests/playwright/e2e/github-happy-path.spec.ts

@@ -1,20 +1,21 @@
 import { test, expect, Page } from "@playwright/test";
-import { UIhelper } from "../utils/ui-helper";
+import { UiHelper } from "../utils/ui-helper";
 import { Common, setupBrowser } from "../utils/common";
 import { RESOURCES } from "../support/testData/resources";
 import {
   BackstageShowcase,
   CatalogImport,
 } from "../support/pages/catalog-import";
 import { TEMPLATES } from "../support/testData/templates";
+import { LOGGER } from "../utils/logger";
 
 let page: Page;
 
 // TODO: replace skip with serial
 test.describe.skip("GitHub Happy path", () => {
   //TODO: skipping due to RHIDP-4992
   let common: Common;
-  let uiHelper: UIhelper;
+  let uiHelper: UiHelper;
   let catalogImport: CatalogImport;
   let backstageShowcase: BackstageShowcase;
 
@@ -24,7 +25,7 @@ test.describe.skip("GitHub Happy path", () => {
   test.beforeAll(async ({ browser }, testInfo) => {
     page = (await setupBrowser(browser, testInfo)).page;
 
-    uiHelper = new UIhelper(page);
+    uiHelper = new UiHelper(page);
     common = new Common(page);
     catalogImport = new CatalogImport(page);
     backstageShowcase = new BackstageShowcase(page);
@@ -134,24 +135,24 @@ test.describe.skip("GitHub Happy path", () => {
 
   // TODO https://issues.redhat.com/browse/RHIDP-3159 The last ~10 GitHub Pull Requests are missing from the list
   test.skip("Click on the arrows to verify that the next/previous/first/last pages of PRs are loaded", async () => {
-    console.log("Fetching all PRs from GitHub");
+    LOGGER.info("Fetching all PRs from GitHub");
     const allPRs = await BackstageShowcase.getShowcasePRs("all", true);
 
-    console.log("Clicking on ALL button");
+    LOGGER.info("Clicking on ALL button");
     await uiHelper.clickButton("ALL", { force: true });
     await backstageShowcase.verifyPRRows(allPRs, 0, 5);
 
-    console.log("Clicking on Next Page button");
+    LOGGER.info("Clicking on Next Page button");
     await backstageShowcase.clickNextPage();
     await backstageShowcase.verifyPRRows(allPRs, 5, 10);
 
     const lastPagePRs = Math.floor((allPRs.length - 1) / 5) * 5;
 
-    console.log("Clicking on Last Page button");
+    LOGGER.info("Clicking on Last Page button");
     await backstageShowcase.clickLastPage();
     await backstageShowcase.verifyPRRows(allPRs, lastPagePRs, allPRs.length);
 
-    console.log("Clicking on Previous Page button");
+    LOGGER.info("Clicking on Previous Page button");
     await backstageShowcase.clickPreviousPage();
     await backstageShowcase.verifyPRRows(allPRs, lastPagePRs - 5, lastPagePRs);
   });

e2e-tests/playwright/e2e/github-integration-org-fetch.spec.ts

@@ -1,15 +1,15 @@
 import { test, Page } from "@playwright/test";
-import { UIhelper } from "../utils/ui-helper";
+import { UiHelper } from "../utils/ui-helper";
 import { Common, setupBrowser } from "../utils/common";
 
 let page: Page;
 test.describe.serial("GitHub integration with Org data fetching", () => {
   let common: Common;
-  let uiHelper: UIhelper;
+  let uiHelper: UiHelper;
 
   test.beforeAll(async ({ browser }, testInfo) => {
     page = (await setupBrowser(browser, testInfo)).page;
-    uiHelper = new UIhelper(page);
+    uiHelper = new UiHelper(page);
     common = new Common(page);
     await common.loginAsKeycloakUser();
   });

e2e-tests/playwright/e2e/google-signin-happy-path.spec.ts

@@ -1,10 +1,10 @@
 import { test, Page } from "@playwright/test";
 import { Common } from "../utils/common";
-import { UIhelper } from "../utils/ui-helper";
+import { UiHelper } from "../utils/ui-helper";
 
 let page: Page;
 test.describe.skip("Google signin happy path", () => {
-  let uiHelper: UIhelper;
+  let uiHelper: UiHelper;
   let common: Common;
   const googleUserId = process.env.GOOGLE_USER_ID;
 
@@ -19,7 +19,7 @@ test.describe.skip("Google signin happy path", () => {
     });
     page = await context.newPage();
 
-    uiHelper = new UIhelper(page);
+    uiHelper = new UiHelper(page);
     common = new Common(page);
 
     await common.loginAsGuest();