diff --git a/workspaces/tech-radar/e2e-tests/playwright.config.ts b/workspaces/tech-radar/e2e-tests/playwright.config.ts index 60cd75efe..13f39c016 100644 --- a/workspaces/tech-radar/e2e-tests/playwright.config.ts +++ b/workspaces/tech-radar/e2e-tests/playwright.config.ts @@ -11,5 +11,8 @@ export default defineConfig({ { name: "tech-radar", }, + { + name: "tech-radar-app-next", + }, ], }); diff --git a/workspaces/tech-radar/e2e-tests/tests/config/app-config-rhdh-next.yaml b/workspaces/tech-radar/e2e-tests/tests/config/app-config-rhdh-next.yaml new file mode 100644 index 000000000..cddb17bfd --- /dev/null +++ b/workspaces/tech-radar/e2e-tests/tests/config/app-config-rhdh-next.yaml @@ -0,0 +1,9 @@ +app: + title: RHDH Tech Radar Test Instance (app-next) +backend: + reading: + allow: + - host: ${TECH_RADAR_DATA_URL} +techRadar: + url: "http://${TECH_RADAR_DATA_URL}/tech-radar" +signInPage: oidc diff --git a/workspaces/tech-radar/e2e-tests/tests/config/app-config-rhdh.yaml b/workspaces/tech-radar/e2e-tests/tests/config/app-config-rhdh.yaml index dce7164b0..5de76807b 100644 --- a/workspaces/tech-radar/e2e-tests/tests/config/app-config-rhdh.yaml +++ b/workspaces/tech-radar/e2e-tests/tests/config/app-config-rhdh.yaml @@ -1,8 +1,5 @@ -# rhdh app config file -# this file is used to merge with the default values of the rhdh app config - app: - title: RHDH Tech Radar Test Instance + title: RHDH Tech Radar Test Instance (app) backend: reading: allow: diff --git a/workspaces/tech-radar/e2e-tests/tests/config/dynamic-plugins.yaml b/workspaces/tech-radar/e2e-tests/tests/config/dynamic-plugins.yaml new file mode 100644 index 000000000..270d92fc2 --- /dev/null +++ b/workspaces/tech-radar/e2e-tests/tests/config/dynamic-plugins.yaml @@ -0,0 +1,9 @@ +includes: + - dynamic-plugins.default.yaml +plugins: + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tech-radar:bs_1.49.4__1.17.0 + disabled: false + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tech-radar-backend:bs_1.49.4__1.16.0 + disabled: false + - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-auth:bs_1.49.4__0.0.1 + disabled: false diff --git a/workspaces/tech-radar/e2e-tests/tests/config/rhdh-secrets-next.yaml b/workspaces/tech-radar/e2e-tests/tests/config/rhdh-secrets-next.yaml new file mode 100644 index 000000000..f616ad654 --- /dev/null +++ b/workspaces/tech-radar/e2e-tests/tests/config/rhdh-secrets-next.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +kind: Secret +metadata: + name: rhdh-secrets +type: Opaque +stringData: + TECH_RADAR_DATA_URL: $TECH_RADAR_DATA_URL + APP_CONFIG_app_packageName: app-next + ENABLE_STANDARD_MODULE_FEDERATION: "true" diff --git a/workspaces/tech-radar/e2e-tests/tests/specs/tech-radar.spec.ts b/workspaces/tech-radar/e2e-tests/tests/specs/tech-radar.spec.ts index ebcc2dcce..12f07f4e0 100644 --- a/workspaces/tech-radar/e2e-tests/tests/specs/tech-radar.spec.ts +++ b/workspaces/tech-radar/e2e-tests/tests/specs/tech-radar.spec.ts @@ -2,6 +2,8 @@ import { test, expect, Page } from "@red-hat-developer-hub/e2e-test-utils/test"; import { $ } from "@red-hat-developer-hub/e2e-test-utils/utils"; import path from "path"; +const secretsFileAppNext = "tests/config/rhdh-secrets-next.yaml"; +const configFileAppNext = "tests/config/app-config-rhdh-next.yaml"; const setupScript = path.join( import.meta.dirname, "deploy-customization-provider.sh", @@ -10,7 +12,13 @@ const setupScript = path.join( test.describe("Test tech-radar plugin", () => { test.beforeAll(async ({ rhdh }) => { const project = rhdh.deploymentConfig.namespace; - await rhdh.configure({ auth: "keycloak" }); + await rhdh.configure({ + auth: "keycloak", + ...(project === "tech-radar-app-next" && { + appConfig: configFileAppNext, + secrets: secretsFileAppNext, + }), + }); await $`bash ${setupScript} ${project}`; process.env.TECH_RADAR_DATA_URL = ( await rhdh.k8sClient.getRouteLocation(