diff --git a/.common-ci.yml b/.common-ci.yml index 95d6ab9f8..403254f6f 100644 --- a/.common-ci.yml +++ b/.common-ci.yml @@ -175,7 +175,6 @@ trigger-pipeline: # Define the source image for the release IMAGE_NAME: "${CI_REGISTRY_IMAGE}" VERSION: "${CI_COMMIT_SHORT_SHA}" - # OUT_VERSION is overridden for external releases OUT_VERSION: "${CI_COMMIT_SHORT_SHA}" OUT_DIST: "${DIST}" artifacts: @@ -194,7 +193,7 @@ trigger-pipeline: # Since OUT_IMAGE_NAME and OUT_VERSION are set, this will push the CI image to the target - if [[ "${PRECOMPILED}" == "true" ]]; then ./scripts/precompiled.sh push; else make push-${DIST}-${DRIVER_VERSION}; fi - mkdir -p build-info - - echo "${CI_COMMIT_SHORT_SHA}-${DRIVER_VERSION}-${DIST} ${DRIVER_VERSION}-${OUT_DIST}" > build-info/${CI_PIPELINE_ID}-${DRIVER_VERSION}-${OUT_DIST}.txt + - echo "${CI_COMMIT_SHORT_SHA}-${DRIVER_VERSION}-${OUT_DIST} ${DRIVER_VERSION}-${OUT_DIST}" > build-info/${CI_PIPELINE_ID}-${DRIVER_VERSION}-${OUT_DIST}.txt .release-ubuntu22.04: # Perform for each DRIVER_VERSION @@ -307,9 +306,6 @@ trigger-pipeline: - .release rules: - if: $CI_COMMIT_TAG - variables: - #VERSION: "${CI_COMMIT_TAG}" - OUT_VERSION: "" - if: $CI_COMMIT_BRANCH == $RELEASE_DEVEL_BRANCH variables: VERSION: "${RELEASE_DEVEL_TAG}" @@ -320,9 +316,6 @@ trigger-pipeline: - .release-ubuntu24.04 rules: - if: $CI_COMMIT_TAG - variables: - #VERSION: "${CI_COMMIT_TAG}" - OUT_VERSION: "" - if: $CI_COMMIT_BRANCH == $RELEASE_DEVEL_BRANCH variables: VERSION: "${RELEASE_DEVEL_TAG}" @@ -333,9 +326,6 @@ trigger-pipeline: - .release-ubuntu22.04 rules: - if: $CI_COMMIT_TAG - variables: - #VERSION: "${CI_COMMIT_TAG}" - OUT_VERSION: "" - if: $CI_COMMIT_BRANCH == $RELEASE_DEVEL_BRANCH variables: VERSION: "${RELEASE_DEVEL_TAG}"