Merge remote-tracking branch 'upstream/main'

jstourac · jstourac · commit 76bf966dabd6 · 2025-05-27T11:53:04.000Z
diff --git a/ci/check-params-env.sh b/ci/check-params-env.sh
@@ -556,7 +556,7 @@ function check_image() {
         echo "Couldn't get 'OPENSHIFT_BUILD_NAME' from set of the image environment variables, maybe this is a Konflux build?"
         # Let's keep this check here until we have all images on konflux - just to keep this check for older releases.
         # For konflux images, the name of the repository should be now good enough as a check instead of this variable.
-        build_name_raw="OPENSHIFT_BUILD_NAME=konflux"
+        build_name_raw="\"OPENSHIFT_BUILD_NAME=konflux\""
     }
     openshift_build_name=$(echo "${build_name_raw}" | sed 's/.*"OPENSHIFT_BUILD_NAME=\(.*\)".*/\1/') || {
         echo "Couldn't parse value of the 'OPENSHIFT_BUILD_NAME' variable from '${build_name_raw}'!"

Original file line number	Diff line number	Diff line change
`@@ -556,7 +556,7 @@ function check_image() {`
`556`	`556`	`echo "Couldn't get 'OPENSHIFT_BUILD_NAME' from set of the image environment variables, maybe this is a Konflux build?"`
`557`	`557`	`# Let's keep this check here until we have all images on konflux - just to keep this check for older releases.`
`558`	`558`	`# For konflux images, the name of the repository should be now good enough as a check instead of this variable.`
`559`		`- build_name_raw="OPENSHIFT_BUILD_NAME=konflux"`
	`559`	`+ build_name_raw="\"OPENSHIFT_BUILD_NAME=konflux\""`
`560`	`560`	`}`
`561`	`561`	`openshift_build_name=$(echo "${build_name_raw}" \| sed 's/."OPENSHIFT_BUILD_NAME=\(.\)".*/\1/') \|\| {`
`562`	`562`	`echo "Couldn't parse value of the 'OPENSHIFT_BUILD_NAME' variable from '${build_name_raw}'!"`