Skip to content

Commit adb2e11

Browse files
committed
Migrate tests to use extensions catalog entities from overlay repo
1 parent b3658d2 commit adb2e11

6 files changed

Lines changed: 31 additions & 5 deletions

File tree

.ibm/pipelines/value_files/values_showcase-auth-providers.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ upstream:
208208
env:
209209
- name: NPM_CONFIG_USERCONFIG
210210
value: /opt/app-root/src/.npmrc.dynamic-plugins
211+
- name: CATALOG_INDEX_IMAGE
212+
value: "quay.io/rhdh/plugin-catalog-index:1.9"
211213
image: '{{ include "backstage.image" . }}'
212214
imagePullPolicy: Always
213215
name: install-dynamic-plugins

.ibm/pipelines/value_files/values_showcase-rbac.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,12 @@ global:
180180
frontend:
181181
red-hat-developer-hub.backstage-plugin-orchestrator-form-widgets: {}
182182

183+
catalogIndex:
184+
image:
185+
registry: quay.io
186+
repository: rhdh/plugin-catalog-index
187+
tag: "1.9"
188+
183189
# -- Upstream Backstage [chart configuration](https://github.com/backstage/charts/blob/main/charts/backstage/values.yaml)
184190
# @default -- Use Openshift compatible settings
185191
upstream:

.ibm/pipelines/value_files/values_showcase.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,12 @@ global:
251251
frontend:
252252
red-hat-developer-hub.backstage-plugin-orchestrator-form-widgets: {}
253253

254+
catalogIndex:
255+
image:
256+
registry: quay.io
257+
repository: rhdh/plugin-catalog-index
258+
tag: "1.9"
259+
254260
# -- Upstream Backstage [chart configuration](https://github.com/backstage/charts/blob/main/charts/backstage/values.yaml)
255261
upstream:
256262
nameOverride: developer-hub

.rhdh/docker/Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,14 @@ COPY --from=build --chown=1001:1001 "$CONTAINER_SOURCE"/ ./
267267
# RHIDP-4220 - make Konflux preflight and EC checks happy - [check-container] Create a directory named /licenses and include all relevant licensing
268268
COPY $EXTERNAL_SOURCE_NESTED/LICENSE /licenses/
269269

270-
# RHIDP-5216/RHIDP-5215 - interim marketplace catalog entities until these data will be loaded from container images
271-
COPY $EXTERNAL_SOURCE_NESTED/catalog-entities/marketplace /marketplace/catalog-entities/
270+
# Catalog index image configuration for runtime extraction
271+
# Catalog entities are NOT embedded in the image - they are extracted at runtime from the catalog index image
272+
# Uses the new catalog index image location as per RHIDP-9762/RHIDP-9763
273+
# (https://github.com/redhat-developer/rhdh-operator/pull/2000)
274+
# The CATALOG_INDEX_IMAGE env var can be overridden at runtime via extraEnvs (e.g., in Helm values or Operator CR)
275+
# ENV CATALOG_INDEX_IMAGE=quay.io/rhdh/plugin-catalog-index:1.9
276+
# Create directory for catalog entities to be extracted at runtime
277+
# RUN mkdir -p /marketplace/catalog-entities
272278

273279
# Copy script to gather dynamic plugins; copy embedded dynamic plugins to root folder; fix permissions
274280
COPY $EXTERNAL_SOURCE_NESTED/docker/install-dynamic-plugins.py $EXTERNAL_SOURCE_NESTED/docker/install-dynamic-plugins.sh ./

docker/Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,14 @@ COPY --from=build --chown=1001:1001 $CONTAINER_SOURCE/dynamic-plugins/dist/ ./dy
238238
# RHIDP-4220 - make Konflux preflight and EC checks happy - [check-container] Create a directory named /licenses and include all relevant licensing
239239
COPY $EXTERNAL_SOURCE_NESTED/LICENSE /licenses/
240240

241-
# RHIDP-5216/RHIDP-5215 - interim marketplace catalog entities until these data will be loaded from container images
242-
COPY $EXTERNAL_SOURCE_NESTED/catalog-entities/marketplace /marketplace/catalog-entities/
241+
# Catalog index image configuration for runtime extraction
242+
# Catalog entities are NOT embedded in the image - they are extracted at runtime from the catalog index image
243+
# Uses the new catalog index image location as per RHIDP-9762/RHIDP-9763
244+
# (https://github.com/redhat-developer/rhdh-operator/pull/2000)
245+
# The CATALOG_INDEX_IMAGE env var can be overridden at runtime via extraEnvs (e.g., in Helm values or Operator CR)
246+
# ENV CATALOG_INDEX_IMAGE=quay.io/rhdh/plugin-catalog-index:1.9
247+
# Create directory for catalog entities to be extracted at runtime
248+
# RUN mkdir -p /marketplace/catalog-entities
243249

244250
# Copy script to gather dynamic plugins; copy embedded dynamic plugins to root folder; fix permissions
245251
COPY docker/install-dynamic-plugins.py docker/install-dynamic-plugins.sh ./

e2e-tests/playwright/e2e/extensions.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ test.describe("Admin > Extensions", () => {
5555
});
5656

5757
// FIXME https://issues.redhat.com/browse/RHIDP-8971
58-
test.describe.skip("Extensions > Catalog", () => {
58+
test.describe("Extensions > Catalog", () => {
5959
test("Verify search bar in extensions", async ({ page }) => {
6060
await uiHelper.searchInputAriaLabel("Dynatrace");
6161
await uiHelper.verifyHeading("DynaTrace");

0 commit comments

Comments
 (0)