Skip to content

Conversation

@sanketpathak
Copy link
Contributor

Description

https://issues.redhat.com/browse/RHIDP-8971

Please explain the changes you made here.

Which issue(s) does this PR fix

  • Fixes #?

PR acceptance criteria

Please make sure that the following steps are complete:

  • GitHub Actions are completed and successful
  • Unit Tests are updated and passing
  • E2E Tests are updated and passing
  • Documentation is updated if necessary (requirement for new features)
  • Add a screenshot if the change is UX/UI related

How to test changes / Special notes to the reviewer

@openshift-ci openshift-ci bot requested review from albarbaro and kadel November 27, 2025 13:56
@sanketpathak sanketpathak changed the title Migrate tests to use extensions catalog entities from overlay repo fix(RHIDP-8971): Migrate tests to use extensions catalog entities from overlay repo Dec 3, 2025
@sanketpathak sanketpathak changed the title fix(RHIDP-8971): Migrate tests to use extensions catalog entities from overlay repo fix(RHIDP-8971): migrate tests to use extensions catalog entities from overlay repo Dec 4, 2025
@sanketpathak sanketpathak force-pushed the migrate-tests-to-use-extensions-catalog-entities-from-overlay-repo branch from 9d56412 to a9b4ef6 Compare December 4, 2025 12:41
@sanketpathak
Copy link
Contributor Author

/retest

@sanketpathak sanketpathak force-pushed the migrate-tests-to-use-extensions-catalog-entities-from-overlay-repo branch from a9b4ef6 to 9729237 Compare December 10, 2025 19:04
@openshift-ci
Copy link

openshift-ci bot commented Dec 10, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign christoph-jerolimov for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@sanketpathak sanketpathak force-pushed the migrate-tests-to-use-extensions-catalog-entities-from-overlay-repo branch from 9729237 to 2684ad7 Compare December 11, 2025 14:23
@gustavolira
Copy link
Member

/test e2e-ocp-helm

@openshift-ci
Copy link

openshift-ci bot commented Dec 11, 2025

@sanketpathak: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-ocp-helm 2684ad7 link true /test e2e-ocp-helm

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

# RHIDP-5216/RHIDP-5215 - interim marketplace catalog entities until these data will be loaded from container images
COPY $EXTERNAL_SOURCE_NESTED/catalog-entities/marketplace /marketplace/catalog-entities/
# Extract marketplace catalog entities from the new index image
FROM quay.io/rhdh/plugin-catalog-index:1.9.0 AS catalog-index
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a scratch image, so you can't just reference it this way

FROM runner AS final

# Copy catalog entities from the index image instead of local files
COPY --from=catalog-index /catalog-entities/marketplace /opt/app-root/src/marketplace/catalog-entities/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because quay.io/rhdh/plugin-catalog-index are scratch images (with no OS) you can't just pull the image and mount it to get file paths. You have to extract the contents.

See https://gist.github.com/nickboldt/86f78312234d84490f1186b389235a29#file-unpack-oci-sh-L5-L7 for how to fetch, unpack, and access the files you want

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

@nickboldt nickboldt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The approach here is wrong.

We do NOT want to continue to embed the catalog entities in the RHDH image. That was why we moved them into a separate container image.

The ask in https://issues.redhat.com/browse/RHIDP-8971 was to have the tests use the NEW location of the catalog index image, not to re-embed the contents back into the RHDH image.

See also https://issues.redhat.com/browse/RHIDP-9764 and https://issues.redhat.com/browse/RHIDP-9762 where we're adding the ability for the helm and operator to deploy the index image at install time.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants