@red-hat-developer-hub/e2e-test-utils 1.1.41 → 1.1.43

package/dist/deployment/rhdh/config/operator/subscription.yaml

@@ -1,4 +1,4 @@
-apiVersion: rhdh.redhat.com/v1alpha3
+apiVersion: rhdh.redhat.com/v1alpha5
 kind: Backstage
 metadata:
   name: developer-hub

package/dist/deployment/rhdh/deployment.d.ts

@@ -34,6 +34,7 @@ export declare class RHDHDeployment {
     private _applyDynamicPlugins;
     private _deployWithHelm;
     private _deployWithOperator;
+    private get _labelSelector();
     rolloutRestart(): Promise<void>;
     /**
      * Performs a clean restart by scaling down to 0 first, waiting for pods to terminate,

package/dist/deployment/rhdh/deployment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAwB1E,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAGjB,MAAM,YAAY,CAAC;AAEpB,qBAAa,cAAc;IAClB,SAAS,yBAAgC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,gBAAgB,CAAC;gBAE9B,SAAS,EAAE,MAAM;IAKvB,MAAM,CAAC,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YA0CpD,eAAe;YAmBf,aAAa;IA2B3B,uDAAuD;IACvD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAE5B;IAEX;;;OAGG;YACW,iBAAiB;IAe/B;;OAEG;YACW,uBAAuB;IAgBrC;;;;;;;;OAQG;YACW,0BAA0B;YAsC1B,oBAAoB;YAWpB,eAAe;YAuEf,mBAAmB;IAoE3B,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrC;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC,cAAc,CAAC,OAAO,GAAE,MAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BpD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAIjB,iBAAiB;YASjB,oBAAoB;IAsClC;;;OAGG;YACW,0BAA0B;IAwCxC,OAAO,CAAC,sBAAsB;IA2CxB,SAAS,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrE,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,SAAS;CAMlB"}
+{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAwB1E,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAGjB,MAAM,YAAY,CAAC;AAEpB,qBAAa,cAAc;IAClB,SAAS,yBAAgC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,gBAAgB,CAAC;gBAE9B,SAAS,EAAE,MAAM;IAKvB,MAAM,CAAC,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YA0CpD,eAAe;YAmBf,aAAa;IA2B3B,uDAAuD;IACvD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAE5B;IAEX;;;OAGG;YACW,iBAAiB;IAe/B;;OAEG;YACW,uBAAuB;IAgBrC;;;;;;;;OAQG;YACW,0BAA0B;YAsC1B,oBAAoB;YAWpB,eAAe;YAuEf,mBAAmB;IAmCjC,OAAO,KAAK,cAAc,GAIzB;IAEK,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrC;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC,cAAc,CAAC,OAAO,GAAE,MAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BpD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAIjB,iBAAiB;YASjB,oBAAoB;IAsClC;;;OAGG;YACW,0BAA0B;IAwCxC,OAAO,CAAC,sBAAsB;IA2CxB,SAAS,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrE,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,SAAS;CAMlB"}

package/dist/deployment/rhdh/deployment.js

@@ -229,44 +229,20 @@ export class RHDHDeployment {
             });
             this._log(`Catalog index image: ${catalogIndexImage}`);
         }
-        this._logBoxen("Subscription", subscriptionObject);
+        this._logBoxen("Backstage CR", subscriptionObject);
         const subscriptionFilePath = path.join(os.tmpdir(), `${this.deploymentConfig.namespace}-subscription.yaml`);
         fs.writeFileSync(subscriptionFilePath, yaml.dump(subscriptionObject));
-        const version = this.deploymentConfig.version;
-        const isSemanticVersion = /^\d+(\.\d+)?$/.test(version);
-        // Use main branch for non-semantic versions (e.g., "next", "latest")
-        const branch = isSemanticVersion ? `release-${version}` : "main";
-        // Build version argument based on version type
-        let versionArg;
-        if (isSemanticVersion) {
-            versionArg = `-v ${version}`;
-        }
-        else if (version === "next") {
-            versionArg = "--next";
-        }
-        else {
-            throw new Error(`Invalid RHDH version "${version}". Use semantic version (e.g., "1.5") or "next".`);
-        }
-        this._log(`Using operator branch: ${branch}, version arg: ${versionArg}`);
-        await $ `
-      set -e;
-      curl -sf https://raw.githubusercontent.com/redhat-developer/rhdh-operator/refs/heads/${branch}/.rhdh/scripts/install-rhdh-catalog-source.sh | bash -s -- ${versionArg} --install-operator rhdh
-
-      timeout 300 bash -c '
-        while ! oc get crd/backstages.rhdh.redhat.com -n "${this.deploymentConfig.namespace}" >/dev/null 2>&1; do
-          echo "Waiting for Backstage CRD to be created..."
-          sleep 20
-        done
-        echo "Backstage CRD is created."
-      ' || echo "Error: Timed out waiting for Backstage CRD creation."
-
-      oc apply -f "${subscriptionFilePath}" -n "${this.deploymentConfig.namespace}"
-    `;
-        this._log("Operator deployment executed successfully.");
+        await $ `oc apply -f "${subscriptionFilePath}" -n "${this.deploymentConfig.namespace}"`;
+        this._log("Backstage CR applied successfully.");
+    }
+    get _labelSelector() {
+        return this.deploymentConfig.method === "operator"
+            ? "rhdh.redhat.com/app=backstage-developer-hub"
+            : "app.kubernetes.io/instance in (redhat-developer-hub,developer-hub)";
     }
     async rolloutRestart() {
         this._log(`Restarting RHDH deployment in namespace ${this.deploymentConfig.namespace}...`);
-        await $ `oc rollout restart deployment -l 'app.kubernetes.io/instance in (redhat-developer-hub,developer-hub)' -n ${this.deploymentConfig.namespace}`;
+        await $ `oc rollout restart deployment -l '${this._labelSelector}' -n ${this.deploymentConfig.namespace}`;
         this._log(`RHDH deployment restarted successfully in namespace ${this.deploymentConfig.namespace}`);
         await this.waitUntilReady();
     }
@@ -277,13 +253,13 @@ export class RHDHDeployment {
      */
     async scaleDownAndRestart() {
         const namespace = this.deploymentConfig.namespace;
-        await $ `oc scale deployment -l 'app.kubernetes.io/instance in (redhat-developer-hub,developer-hub)' --replicas=0 -n ${namespace}`;
-        await $ `oc wait --for=delete pod -l 'app.kubernetes.io/instance in (redhat-developer-hub,developer-hub),app.kubernetes.io/name!=postgresql' -n ${namespace} --timeout=120s || true`;
-        await $ `oc scale deployment -l 'app.kubernetes.io/instance in (redhat-developer-hub,developer-hub)' --replicas=1 -n ${namespace}`;
+        await $ `oc scale deployment -l '${this._labelSelector}' --replicas=0 -n ${namespace}`;
+        await $ `oc wait --for=delete pod -l '${this._labelSelector}' -n ${namespace} --timeout=120s || true`;
+        await $ `oc scale deployment -l '${this._labelSelector}' --replicas=1 -n ${namespace}`;
     }
     async waitUntilReady(timeout = 500) {
         const namespace = this.deploymentConfig.namespace;
-        const labelSelector = "app.kubernetes.io/instance in (redhat-developer-hub,developer-hub)";
+        const labelSelector = this._labelSelector;
         const startTime = Date.now();
         try {
             await this.k8sClient.waitForPodsWithFailureDetection(namespace, labelSelector, timeout);

package/dist/deployment/rhdh/operator-setup.d.ts

@@ -0,0 +1,2 @@
+export declare function installRHDHOperator(): Promise<void>;
+//# sourceMappingURL=operator-setup.d.ts.map

package/dist/deployment/rhdh/operator-setup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"operator-setup.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/operator-setup.ts"],"names":[],"mappings":"AAEA,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CA0DzD"}

package/dist/deployment/rhdh/operator-setup.js

@@ -0,0 +1,46 @@
+import { $ } from "../../utils/bash.js";
+export async function installRHDHOperator() {
+    if (process.env.INSTALLATION_METHOD !== "operator") {
+        return;
+    }
+    if (process.env.SKIP_OPERATOR_INSTALLATION === "true") {
+        console.log("Skipping RHDH operator installation");
+        return;
+    }
+    const version = process.env.RHDH_VERSION ?? "next";
+    const isSemanticVersion = /^\d+(\.\d+)?$/.test(version);
+    const branch = isSemanticVersion ? `release-${version}` : "main";
+    let versionArgs;
+    if (isSemanticVersion) {
+        versionArgs = ["-v", version];
+    }
+    else if (version === "next") {
+        versionArgs = ["--next"];
+    }
+    else {
+        throw new Error(`Invalid RHDH version "${version}". Use semantic version (e.g., "1.5") or "next".`);
+    }
+    console.log(`Installing RHDH operator (branch: ${branch}, version: ${versionArgs.join(" ")})...`);
+    const scriptUrl = `https://raw.githubusercontent.com/redhat-developer/rhdh-operator/refs/heads/${branch}/.rhdh/scripts/install-rhdh-catalog-source.sh`;
+    try {
+        await $ `curl -sf ${scriptUrl} | bash -s -- ${versionArgs} --install-operator rhdh`;
+    }
+    catch (error) {
+        throw new Error(`install-rhdh-catalog-source.sh failed (branch: ${branch}, args: ${versionArgs.join(" ")} --install-operator rhdh).\nScript URL: ${scriptUrl}\n${error instanceof Error ? error.message : error}`, { cause: error });
+    }
+    try {
+        await $ `
+      timeout 300 bash -c '
+        while ! oc get crd backstages.rhdh.redhat.com >/dev/null 2>&1; do
+          echo "Waiting for Backstage CRD to be created..."
+          sleep 10
+        done
+        echo "Backstage CRD is created."
+      '
+    `;
+    }
+    catch (error) {
+        throw new Error("Timed out waiting for Backstage CRD (backstages.rhdh.redhat.com) after 300s. The operator may not have installed correctly.", { cause: error });
+    }
+    console.log("RHDH operator installation completed");
+}

package/dist/playwright/global-setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global-setup.d.ts","sourceRoot":"","sources":["../../src/playwright/global-setup.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AA6EnD,wBAA8B,WAAW,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ3E"}
+{"version":3,"file":"global-setup.d.ts","sourceRoot":"","sources":["../../src/playwright/global-setup.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AA8EnD,wBAA8B,WAAW,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ3E"}

package/dist/playwright/global-setup.js

@@ -7,6 +7,7 @@ import { resolve } from "path";
 import { KubernetesClientHelper } from "../utils/kubernetes-client.js";
 import { $ } from "../utils/bash.js";
 import { KeycloakHelper } from "../deployment/keycloak/index.js";
+import { installRHDHOperator } from "../deployment/rhdh/operator-setup.js";
 import { DEFAULT_KEYCLOAK_CONFIG, DEFAULT_RHDH_CLIENT, DEFAULT_USERS, } from "../deployment/keycloak/constants.js";
 import { loadLocalVaultSecrets } from "../utils/vault.js";
 const REQUIRED_BINARIES = ["oc", "kubectl", "helm"];
@@ -67,7 +68,7 @@ export default async function globalSetup(config) {
     await loadLocalVaultSecrets();
     loadDotenvFromProjects(config);
     await setClusterRouterBaseEnv();
-    await deployKeycloak();
+    await Promise.all([installRHDHOperator(), deployKeycloak()]);
     console.log("Global setup completed successfully");
 }
 /**

package/dist/playwright/helpers/common.d.ts

@@ -11,6 +11,7 @@ export declare class LoginHelper {
     loginAsKeycloakUser(userid?: string, password?: string): Promise<void>;
     loginAsGithubUser(userid?: string): Promise<void>;
     checkAndReauthorizeGithubApp(): Promise<void>;
+    private handleGithubPopupReauth;
     googleSignIn(email: string): Promise<void>;
     checkAndClickOnGHloginPopup(force?: boolean): Promise<void>;
     getButtonSelector(label: string): string;

package/dist/playwright/helpers/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/playwright/helpers/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAOhE,qBAAa,WAAW;IACtB,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,EAAE,QAAQ,CAAC;gBAEP,IAAI,EAAE,IAAI;IAKhB,YAAY;IAcZ,OAAO;YAMC,aAAa;IAyCrB,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAO7D,mBAAmB,CACvB,MAAM,GAAE,MAAkC,EAC1C,QAAQ,GAAE,MAAkC;IAWxC,iBAAiB,CACrB,MAAM,GAAE,MAA+C;IA6BnD,4BAA4B;IAqB5B,YAAY,CAAC,KAAK,EAAE,MAAM;IA2B1B,2BAA2B,CAAC,KAAK,UAAQ;IAU/C,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIxC,mBAAmB,IAAI,MAAM;IAIvB,mBAAmB;IAgBzB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAevC,eAAe,IAAI,MAAM;IAKnB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;YAqCxC,sBAAsB;IAoD9B,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAYjE,2BAA2B,CAC/B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM;IAYb,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CA2C7D;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;;;GAWtE"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/playwright/helpers/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAOhE,qBAAa,WAAW;IACtB,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,EAAE,QAAQ,CAAC;gBAEP,IAAI,EAAE,IAAI;IAKhB,YAAY;IAcZ,OAAO;YAMC,aAAa;IA2CrB,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAO7D,mBAAmB,CACvB,MAAM,GAAE,MAAkC,EAC1C,QAAQ,GAAE,MAAkC;IAWxC,iBAAiB,CACrB,MAAM,GAAE,MAA+C;IAoDnD,4BAA4B;YASpB,uBAAuB;IAgB/B,YAAY,CAAC,KAAK,EAAE,MAAM;IA2B1B,2BAA2B,CAAC,KAAK,UAAQ;IAU/C,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIxC,mBAAmB,IAAI,MAAM;IAIvB,mBAAmB;IAgBzB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAevC,eAAe,IAAI,MAAM;IAKnB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;YAqCxC,sBAAsB;IAoD9B,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAYjE,2BAA2B,CAC/B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM;IAYb,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CA2C7D;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;;;GAWtE"}

package/dist/playwright/helpers/common.js

@@ -46,13 +46,15 @@ export class LoginHelper {
         }
         await this.page.click('[value="Sign in"]');
         await this.page.fill("#app_totp", this.getGitHub2FAOTP(userid));
-        test.setTimeout(130000);
+        test.setTimeout(260_000);
         if ((await this.uiHelper.isTextVisible("The two-factor code you entered has already been used")) ||
             (await this.uiHelper.isTextVisible("too many codes have been submitted", 3000))) {
             await this.page.waitForTimeout(60000);
             await this.page.fill("#app_totp", this.getGitHub2FAOTP(userid));
         }
-        await this.page.waitForTimeout(3_000);
+        await this.page
+            .getByRole("heading", { name: "Home" })
+            .waitFor({ timeout: 30_000 });
     }
     async logintoKeycloak(popup, userid, password) {
         await popup.waitForLoadState();
@@ -80,7 +82,23 @@ export class LoginHelper {
             await this.page.goto("/");
             await this.uiHelper.waitForLoad(12000);
             await this.uiHelper.clickButton("Sign In");
-            await this.checkAndReauthorizeGithubApp();
+            // Wait for either: sidebar appears (auto-login) or popup opens (needs auth)
+            const navPromise = this.page
+                .waitForSelector("nav a", { timeout: 15_000 })
+                .then(() => "nav")
+                .catch(() => null);
+            const popupPromise = this.page
+                .waitForEvent("popup", { timeout: 15_000 })
+                .then((popup) => ({ popup }))
+                .catch(() => null);
+            const result = await Promise.race([navPromise, popupPromise]);
+            if (result === null) {
+                throw new Error("GitHub login failed: neither sidebar nor popup appeared after Sign In — session file may be stale");
+            }
+            if (typeof result === "object" && "popup" in result) {
+                // Popup opened — handle reauthorization
+                await this.handleGithubPopupReauth(result.popup);
+            }
         }
         else {
             // Perform login if no session file exists, then save the state
@@ -97,21 +115,24 @@ export class LoginHelper {
     async checkAndReauthorizeGithubApp() {
         await new Promise((resolve) => {
             this.page.once("popup", async (popup) => {
-                await popup.waitForLoadState();
-                // Check for popup closure for up to 10 seconds before proceeding
-                for (let attempts = 0; attempts < 10 && !popup.isClosed(); attempts++) {
-                    await this.page.waitForTimeout(1000); // Using page here because if the popup closes automatically, it throws an error during the wait
-                }
-                const locator = popup.locator("button.js-oauth-authorize-btn");
-                if (!popup.isClosed() && (await locator.isVisible())) {
-                    await popup.locator("body").click();
-                    await locator.waitFor();
-                    await locator.click();
-                }
+                await this.handleGithubPopupReauth(popup);
                 resolve();
             });
         });
     }
+    async handleGithubPopupReauth(popup) {
+        await popup.waitForLoadState();
+        // Check for popup closure for up to 10 seconds before proceeding
+        for (let attempts = 0; attempts < 10 && !popup.isClosed(); attempts++) {
+            await this.page.waitForTimeout(1000); // Using page here because if the popup closes automatically, it throws an error during the wait
+        }
+        const locator = popup.locator("button.js-oauth-authorize-btn");
+        if (!popup.isClosed() && (await locator.isVisible())) {
+            await popup.locator("body").click();
+            await locator.waitFor();
+            await locator.click();
+        }
+    }
     async googleSignIn(email) {
         await new Promise((resolve) => {
             this.page.once("popup", async (popup) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@red-hat-developer-hub/e2e-test-utils",
-  "version": "1.1.41",
+  "version": "1.1.43",
   "description": "Test utilities for RHDH E2E tests",
   "license": "Apache-2.0",
   "repository": {