Skip to content

Declare MULTISTAGE_PARAM_OVERRIDE_FBC_COMMIT_SHA as medik8s-catalogsource parameter #83097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Aug 7, 2026
Merged

Declare MULTISTAGE_PARAM_OVERRIDE_FBC_COMMIT_SHA as medik8s-catalogsource parameter #83097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ci-operator/step-registry/medik8s/catalogsource/medik8s-catalogsource-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ ref:
If empty, the step resolves the latest commit from GIT_REF (default: main).
Only used in konflux mode.
default: ""
- name: MULTISTAGE_PARAM_OVERRIDE_FBC_COMMIT_SHA
documentation: |-
Receives FBC commit SHA from Gangway pod_spec_options.envs overrides.
ci-operator's applyEnvOverrides stores env vars with the full prefixed
key name in TestEnvironment, but generateParams only injects env vars
matching declared step parameters. Declaring this parameter makes the
override reachable in the step pod. The step script reads it via:
FBC_COMMIT_SHA="${MULTISTAGE_PARAM_OVERRIDE_FBC_COMMIT_SHA:-${FBC_COMMIT_SHA:-}}"
default: ""
- name: CATALOG_IMAGE_REF
documentation: |-
Direct catalog image reference. Required when CATALOG_MODE=direct.
Expand Down
2 changes: 1 addition & 1 deletion ...egistry/medik8s/disconnected-catalogsource/medik8s-disconnected-catalogsource-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ declare CATALOG_SOURCE_NAME="${CATALOG_SOURCE_NAME:-medik8s-catalog}"
declare IDMS_NAME="${IDMS_NAME:-medik8s-disconnected}"
declare OCP_VERSION="${FBC_OCP_VERSION:-${OCP_VERSION:-}}"
declare GIT_REF="${GIT_REF:-main}"
declare FBC_COMMIT_SHA="${FBC_COMMIT_SHA:-}"
declare FBC_COMMIT_SHA="${MULTISTAGE_PARAM_OVERRIDE_FBC_COMMIT_SHA:-${FBC_COMMIT_SHA:-}}"
# shellcheck disable=SC2034 # used by medik8s-lib.sh verify_fbc_image()
declare FBC_SHA_PINNED="${FBC_COMMIT_SHA:+true}"
if [[ ! -s "${SHARED_DIR}/workload_image" ]]; then
Expand Down
9 changes: 9 additions & 0 deletions ...p-registry/medik8s/disconnected-catalogsource/medik8s-disconnected-catalogsource-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ ref:
Pin to a specific dragonfly/rhwa-fbc commit SHA for reproducibility.
If empty, the step resolves the latest commit from GIT_REF.
default: ""
- name: MULTISTAGE_PARAM_OVERRIDE_FBC_COMMIT_SHA
documentation: |-
Receives FBC commit SHA from Gangway pod_spec_options.envs overrides.
ci-operator's applyEnvOverrides stores env vars with the full prefixed
key name in TestEnvironment, but generateParams only injects env vars
matching declared step parameters. Declaring this parameter makes the
override reachable in the step pod. The step script reads it via:
FBC_COMMIT_SHA="${MULTISTAGE_PARAM_OVERRIDE_FBC_COMMIT_SHA:-${FBC_COMMIT_SHA:-}}"
default: ""
- name: MEDIK8S_PACKAGES
documentation: |-
Comma-separated list of medik8s operator package names to mirror.
Expand Down