@@ -175,8 +175,7 @@ trigger-pipeline:
175175 # Define the source image for the release
176176 IMAGE_NAME : " ${CI_REGISTRY_IMAGE}"
177177 VERSION : " ${CI_COMMIT_SHORT_SHA}"
178- # OUT_VERSION is overridden for external releases
179- OUT_VERSION : " ${CI_COMMIT_SHORT_SHA}"
178+ OUT_VERSION : " ${VERSION}"
180179 OUT_DIST : " ${DIST}"
181180 artifacts :
182181 paths :
@@ -194,7 +193,7 @@ trigger-pipeline:
194193 # Since OUT_IMAGE_NAME and OUT_VERSION are set, this will push the CI image to the target
195194 - if [[ "${PRECOMPILED}" == "true" ]]; then ./scripts/precompiled.sh push; else make push-${DIST}-${DRIVER_VERSION}; fi
196195 - mkdir -p build-info
197- - echo "${CI_COMMIT_SHORT_SHA }-${DRIVER_VERSION}-${DIST } ${DRIVER_VERSION}-${OUT_DIST}" > build-info/${CI_PIPELINE_ID}-${DRIVER_VERSION}-${OUT_DIST}.txt
196+ - echo "${VERSION }-${DRIVER_VERSION}-${OUT_DIST } ${DRIVER_VERSION}-${OUT_DIST}" > build-info/${CI_PIPELINE_ID}-${DRIVER_VERSION}-${OUT_DIST}.txt
198197
199198.release-ubuntu22.04 :
200199 # Perform for each DRIVER_VERSION
@@ -307,9 +306,6 @@ trigger-pipeline:
307306 - .release
308307 rules :
309308 - if : $CI_COMMIT_TAG
310- variables :
311- # VERSION: "${CI_COMMIT_TAG}"
312- OUT_VERSION : " "
313309 - if : $CI_COMMIT_BRANCH == $RELEASE_DEVEL_BRANCH
314310 variables :
315311 VERSION : " ${RELEASE_DEVEL_TAG}"
@@ -320,9 +316,6 @@ trigger-pipeline:
320316 - .release-ubuntu24.04
321317 rules :
322318 - if : $CI_COMMIT_TAG
323- variables :
324- # VERSION: "${CI_COMMIT_TAG}"
325- OUT_VERSION : " "
326319 - if : $CI_COMMIT_BRANCH == $RELEASE_DEVEL_BRANCH
327320 variables :
328321 VERSION : " ${RELEASE_DEVEL_TAG}"
@@ -333,9 +326,6 @@ trigger-pipeline:
333326 - .release-ubuntu22.04
334327 rules :
335328 - if : $CI_COMMIT_TAG
336- variables :
337- # VERSION: "${CI_COMMIT_TAG}"
338- OUT_VERSION : " "
339329 - if : $CI_COMMIT_BRANCH == $RELEASE_DEVEL_BRANCH
340330 variables :
341331 VERSION : " ${RELEASE_DEVEL_TAG}"
0 commit comments