fix(ci): dynamically resolve catalog index image from branch + remove trigger-nightly-job command#4860
Conversation
Deploy showcase-runtime with internal PostgreSQL (Helm sub-chart / operator-managed) instead of external Crunchy DB. This makes the runtime deployment self-contained and fixes the test ordering issue where showcase-runtime tests were always skipped because showcase-runtime-db failures blocked them via Playwright project dependencies. Changes: - Reverse Playwright project dependency: showcase-runtime runs first (no deps), showcase-runtime-db depends on it (runs after) - Pipeline calls showcase-runtime-db which triggers showcase-runtime as dependency - New Helm values (values-showcase-runtime.yaml) with postgresql.enabled=true - New operator CR (rhdh-start-runtime-local.yaml) with internal DB, uses rhdh-runtime-config secret for RHDH_RUNTIME_URL (separate from postgres-cred to avoid POSTGRES_* env vars overriding operator's internal DB config) - New minimal app-config (app-config-rhdh-runtime.yaml) without backend.database - External DB tests use prepareForExternalDatabase() to switch from internal to external DB at runtime (patches ConfigMap + adds env vars via JSON patch) - Extract waitForRuntimeDeploymentReady() utility for reuse - Remove Crunchy PostgresCluster dependency from runtime namespace Verified on OCP cluster: - Helm: deployment + config-map.spec.ts PASSED - Operator: deployment succeeded (2/2 ready, HTTP 200), config-map test ConfigMap update worked, restart hit transient PVC provisioning delay (sandbox cluster infra issue, not code bug) Assisted-by: OpenCode
Replace hardcoded quay.io/rhdh/plugin-catalog-index:1.10 with
branch-aware variables (CATALOG_INDEX_REGISTRY, CATALOG_INDEX_REPO,
CATALOG_INDEX_TAG) derived from RELEASE_BRANCH_NAME.
Add RELEASE_VERSION canonical variable (release-1.10 -> 1.10,
main -> next) to env_variables.sh for reuse across CI scripts.
Changes:
- env_variables.sh: Add RELEASE_VERSION + CATALOG_INDEX_* variables
- 5 operator Backstage CRs: Use $CATALOG_INDEX_* via envsubst
- lib/helm.sh: Add --set global.catalogIndex.image.{registry,repository,tag}
- operator.sh: Simplify version derivation using RELEASE_VERSION
- trigger-nightly-job.sh: Add --catalog-index-{registry,repo,tag} and
--chart-version Gangway override flags for RC/GA verification
Companion PR required in openshift/release to add MULTISTAGE_PARAM_OVERRIDE_*
env vars to step registry ref.yaml + commands.sh files. The rhdh changes
include fallback defaults so order of merge does not matter.
Assisted-by: OpenCode
The trigger-nightly-job command is migrating to the rhdh-skills repository. Remove the agent command wrappers from all 4 agent tool directories (.claude, .cursor, .opencode, .rulesync). The actual shell script (.ci/pipelines/trigger-nightly-job.sh) is retained as it is still used by CI pipelines. Assisted-by: OpenCode
|
Skipping CI for Draft Pull Request. |
|
|
/test e2e-ocp-helm |
|
/test e2e-ocp-operator-nightly |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #4860 +/- ##
===========================================
+ Coverage 41.09% 69.60% +28.51%
===========================================
Files 118 111 -7
Lines 2217 4702 +2485
Branches 563 537 -26
===========================================
+ Hits 911 3273 +2362
- Misses 1301 1429 +128
+ Partials 5 0 -5
Continue to review full report in Codecov by Sentry.
🚀 New features to boost your workflow:
|
|
@zdrapela: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
PR needs rebase. DetailsInstructions 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. |
1 participant
Summary
Dynamically resolve the catalog index image coordinates from
RELEASE_BRANCH_NAMEinstead of hardcoding them, and add Gangway API override support for catalog index and chart version.Also removes the
trigger-nightly-jobagent command wrappers (migrating to rhdh-skills repo).Changes
Dynamic catalog index resolution
env_variables.sh: AddRELEASE_VERSIONcanonical variable (main→next,release-X.Y→X.Y) andCATALOG_INDEX_REGISTRY,CATALOG_INDEX_REPO,CATALOG_INDEX_TAGwith fallback defaultsquay.io/rhdh/plugin-catalog-index:1.10with$CATALOG_INDEX_REGISTRY/$CATALOG_INDEX_REPO:$CATALOG_INDEX_TAGlib/helm.sh: Add--set global.catalogIndex.image.{registry,repository,tag}tohelm::get_image_params()operator.sh: Simplifyif main/elseblock to useRELEASE_VERSIONGangway override support
trigger-nightly-job.sh: Add--catalog-index-registry,--catalog-index-repo,--catalog-index-tag,--chart-versionflagsAgent command removal
trigger-nightly-jobcommand from.claude/,.cursor/,.opencode/,.rulesync/(migrating to rhdh-skills)Companion PR
Testing