diff --git a/ci-operator/step-registry/medik8s/catalogsource/medik8s-catalogsource-ref.yaml b/ci-operator/step-registry/medik8s/catalogsource/medik8s-catalogsource-ref.yaml index fcac4ba065116..17c23703be149 100644 --- a/ci-operator/step-registry/medik8s/catalogsource/medik8s-catalogsource-ref.yaml +++ b/ci-operator/step-registry/medik8s/catalogsource/medik8s-catalogsource-ref.yaml @@ -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. diff --git a/ci-operator/step-registry/medik8s/disconnected-catalogsource/medik8s-disconnected-catalogsource-commands.sh b/ci-operator/step-registry/medik8s/disconnected-catalogsource/medik8s-disconnected-catalogsource-commands.sh index 9c4a458934cf3..8152cc21442ed 100755 --- a/ci-operator/step-registry/medik8s/disconnected-catalogsource/medik8s-disconnected-catalogsource-commands.sh +++ b/ci-operator/step-registry/medik8s/disconnected-catalogsource/medik8s-disconnected-catalogsource-commands.sh @@ -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 diff --git a/ci-operator/step-registry/medik8s/disconnected-catalogsource/medik8s-disconnected-catalogsource-ref.yaml b/ci-operator/step-registry/medik8s/disconnected-catalogsource/medik8s-disconnected-catalogsource-ref.yaml index 0e2f99fe1e44f..56590b48a03e3 100644 --- a/ci-operator/step-registry/medik8s/disconnected-catalogsource/medik8s-disconnected-catalogsource-ref.yaml +++ b/ci-operator/step-registry/medik8s/disconnected-catalogsource/medik8s-disconnected-catalogsource-ref.yaml @@ -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.