Skip to content
Snippets Groups Projects

feat: remove VERSION

Merged Wouter Deconinck requested to merge wdconinc-master-patch-35922 into master
2 files
+ 17
20
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 17
19
@@ -121,9 +121,7 @@ version:
@@ -121,9 +121,7 @@ version:
stage: config
stage: config
script:
script:
- |
- |
VERSION=`head -n1 VERSION`
VERSION="$CI_COMMIT_BRANCH"
VERSION_FULL=${VERSION}
VERSION_SHORT=${VERSION%.*}
TESTING="testing"
TESTING="testing"
NIGHTLY="nightly"
NIGHTLY="nightly"
## determine appropriate major docker tag for this scenario
## determine appropriate major docker tag for this scenario
@@ -137,30 +135,30 @@ version:
@@ -137,30 +135,30 @@ version:
## nightly tag, only used in master
## nightly tag, only used in master
NIGHTLY_TAG=${NIGHTLY}
NIGHTLY_TAG=${NIGHTLY}
if [ "x${CI_PIPELINE_SOURCE}" = "xmerge_request_event" ]; then
if [ "x${CI_PIPELINE_SOURCE}" = "xmerge_request_event" ]; then
INTERNAL_TAG="unstable-mr-${CI_MERGE_REQUEST_ID}"
INTERNAL_TAG="unstable-mr-${CI_MERGE_REQUEST_PROJECT_ID}-${CI_MERGE_REQUEST_IID}"
NIGHTLY_TAG="${INTERNAL_TAG}-nightly"
NIGHTLY_TAG="${INTERNAL_TAG}-nightly"
EXPORT_TAG="${VERSION_SHORT}-unstable"
EXPORT_TAG="unstable-mr-${CI_MERGE_REQUEST_PROJECT_ID}-${CI_MERGE_REQUEST_IID}"
EXPORT_TAG2="unstable-mr-${CI_MERGE_REQUEST_PROJECT_ID}-${CI_MERGE_REQUEST_IID}"
EXPORT_TAG2=
elif [[ "$CI_COMMIT_TAG" =~ ^v${VERSION} ]]; then
elif [[ "$CI_COMMIT_TAG" =~ ^v[0-9.]+ ]]; then
VERSION_FULL="${CI_COMMIT_TAG:1}"
VERSION="${CI_COMMIT_TAG:1}"
INTERNAL_TAG="stable-tag-${VERSION_FULL}"
INTERNAL_TAG="stable-tag-${VERSION}"
NIGHTLY_TAG=
NIGHTLY_TAG=
EXPORT_TAG=${VERSION_FULL}
EXPORT_TAG=${VERSION}
EXPORT_TAG2=
EXPORT_TAG2=
elif [ "$CI_COMMIT_BRANCH" = "v${VERSION_SHORT}-stable" ]; then
elif [[ "$CI_COMMIT_BRANCH" = "v[0-9.]+-stable" ]]; then
 
VERSION="${CI_COMMIT_BRANCH:1}"
INTERNAL_TAG="stable-br-${VERSION}"
INTERNAL_TAG="stable-br-${VERSION}"
NIGHTLY_TAG=
NIGHTLY_TAG=
EXPORT_TAG=${VERSION_SHORT}-stable
EXPORT_TAG=${VERSION}
EXPORT_TAG2=
EXPORT_TAG2=
elif [[ "$CI_COMMIT_BRANCH" =~ ^v${VERSION_SHORT}-[a-z]+-stable ]]; then
elif [[ "$CI_COMMIT_BRANCH" =~ ^v[0-9.]+-[a-z]+-stable ]]; then
VERSION_FULL="${CI_COMMIT_BRANCH:1}"
VERSION="${CI_COMMIT_BRANCH:1}"
INTERNAL_TAG="stable-br-${VERSION_FULL}"
INTERNAL_TAG="stable-br-${VERSION}"
NIGHTLY_TAG=
NIGHTLY_TAG=
EXPORT_TAG=${VERSION_FULL}
EXPORT_TAG=${VERSION}
EXPORT_TAG2=
EXPORT_TAG2=
fi
fi
echo "VERSION_FULL=$VERSION_FULL" >> build.env
echo "VERSION=$VERSION" >> build.env
echo "VERSION_SHORT=$VERSION_SHORT" >> build.env
echo "INTERNAL_TAG=$INTERNAL_TAG" >> build.env
echo "INTERNAL_TAG=$INTERNAL_TAG" >> build.env
echo "NIGHTLY_TAG=$NIGHTLY_TAG" >> build.env
echo "NIGHTLY_TAG=$NIGHTLY_TAG" >> build.env
echo "EXPORT_TAG=$EXPORT_TAG" >> build.env
echo "EXPORT_TAG=$EXPORT_TAG" >> build.env
@@ -446,7 +444,7 @@ jug_xl:feature:
@@ -446,7 +444,7 @@ jug_xl:feature:
if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then
if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then
PUSH_FLAG="--eicweb"
PUSH_FLAG="--eicweb"
fi
fi
FEATURE_EXPORT_TAG="${VERSION_SHORT}-${DETECTOR_BRANCH}-stable"
FEATURE_EXPORT_TAG="${VERSION}-${DETECTOR}-${DETECTOR_BRANCH}-stable"
- ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${INTERNAL_TAG}-${DETECTOR}-${DETECTOR_BRANCH}
- ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${INTERNAL_TAG}-${DETECTOR}-${DETECTOR_BRANCH}
-n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
-n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
${FEATURE_EXPORT_TAG} ${PUSH_FLAG}
${FEATURE_EXPORT_TAG} ${PUSH_FLAG}
Loading