Skip to content

Commit 2684ad7

Browse files
committed
Migrate tests to use extensions catalog entities from overlay repo
1 parent b5436ec commit 2684ad7

2 files changed

Lines changed: 16 additions & 4 deletions

File tree

.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+
# Extract marketplace catalog entities from the new index image
271+
FROM quay.io/rhdh/plugin-catalog-index:1.9.0 AS catalog-index
272+
273+
# Continue with runner stage - need to reference it again after catalog-index stage
274+
FROM runner AS final
275+
276+
# Copy catalog entities from the index image instead of local files
277+
COPY --from=catalog-index /catalog-entities/marketplace /opt/app-root/src/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+
# Extract marketplace catalog entities from the new index image
242+
FROM quay.io/rhdh/plugin-catalog-index:1.9.0 AS catalog-index
243+
244+
# Continue with runner stage - need to reference it again after catalog-index stage
245+
FROM runner AS final
246+
247+
# Copy catalog entities from the index image instead of local files
248+
COPY --from=catalog-index /catalog-entities/marketplace /opt/app-root/src/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 ./

0 commit comments

Comments
 (0)