File tree Expand file tree Collapse file tree 3 files changed +15
-11
lines changed
ci-operator/step-registry
hypershift/kubevirt/install Expand file tree Collapse file tree 3 files changed +15
-11
lines changed Original file line number Diff line number Diff line change @@ -17,16 +17,18 @@ YQ="/tmp/yq"
1717curl -L -o ${YQ} https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64
1818chmod +x ${YQ}
1919
20- # Dynamically get CNV catalog image that was provided to the job via gangway API
20+ # Dynamically get CNV catalog image and channel that were provided to the job via gangway API
2121CNV_PRERELEASE_CATALOG_IMAGE=$( curl -s https://prow.ci.openshift.org/prowjob? prowjob=" ${PROW_JOB_ID} " | \
2222 ${YQ} e ' .spec.pod_spec.containers[0].env[] | select(.name == "CNV_PRERELEASE_CATALOG_IMAGE") | .value' )
23+ CNV_SUBSCRIPTION_CHANNEL=$( curl -s https://prow.ci.openshift.org/prowjob? prowjob=" ${PROW_JOB_ID} " | \
24+ ${YQ} e ' .spec.pod_spec.containers[0].env[] | select(.name == "CNV_CHANNEL") | .value' )
2325
2426if [ " ${CNV_SUBSCRIPTION_SOURCE} " == " redhat-operators" ]
25- then
26- CNV_RELEASE_CHANNEL=stable
27- elif [ -n " ${CNV_PRERELEASE_CATALOG_IMAGE} " ]
28- then
27+ then
2928 CNV_RELEASE_CHANNEL=stable
29+ elif [ -n " ${CNV_PRERELEASE_CATALOG_IMAGE} " ] && [ -n " ${CNV_SUBSCRIPTION_CHANNEL} " ]
30+ then
31+ CNV_RELEASE_CHANNEL=${CNV_SUBSCRIPTION_CHANNEL}
3032else
3133 CNV_RELEASE_CHANNEL=nightly-$( ocp_version)
3234 CNV_PRERELEASE_CATALOG_IMAGE=quay.io/openshift-cnv/nightly-catalog:$( ocp_version)
Original file line number Diff line number Diff line change 1111 env :
1212 - name : ODF_OPERATOR_CHANNEL
1313 documentation : The odf operator channel
14- default : " stable-4.15 "
14+ default : " stable-4.17 "
1515 - name : ODF_SUBSCRIPTION_NAME
1616 documentation : The ODF/OCS subscription name
1717 default : " odf-operator"
Original file line number Diff line number Diff line change @@ -18,16 +18,18 @@ YQ="/tmp/yq"
1818curl -L -o ${YQ} https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64
1919chmod +x ${YQ}
2020
21- # Dynamically get CNV catalog image that was provided to the job via gangway API
21+ # Dynamically get CNV catalog image and channel that were provided to the job via gangway API
2222CNV_PRERELEASE_CATALOG_IMAGE=$( curl -s https://prow.ci.openshift.org/prowjob? prowjob=" ${PROW_JOB_ID} " | \
2323 ${YQ} e ' .spec.pod_spec.containers[0].env[] | select(.name == "CNV_PRERELEASE_CATALOG_IMAGE") | .value' )
24+ CNV_SUBSCRIPTION_CHANNEL=$( curl -s https://prow.ci.openshift.org/prowjob? prowjob=" ${PROW_JOB_ID} " | \
25+ ${YQ} e ' .spec.pod_spec.containers[0].env[] | select(.name == "CNV_CHANNEL") | .value' )
2426
2527if [ " ${CNV_SUBSCRIPTION_SOURCE} " == " redhat-operators" ]
26- then
27- CNV_RELEASE_CHANNEL=stable
28- elif [ -n " ${CNV_PRERELEASE_CATALOG_IMAGE} " ]
29- then
28+ then
3029 CNV_RELEASE_CHANNEL=stable
30+ elif [ -n " ${CNV_PRERELEASE_CATALOG_IMAGE} " ] && [ -n " ${CNV_SUBSCRIPTION_CHANNEL} " ]
31+ then
32+ CNV_RELEASE_CHANNEL=${CNV_SUBSCRIPTION_CHANNEL}
3133else
3234 if [ " ${CNV_PRERELEASE_LATEST_CHANNEL} " == " true" ]; then
3335 cnv_version=4.99
You can’t perform that action at this time.
0 commit comments