set versions and image tag

.gitlab-ci.yml

@@ -2,10 +2,8 @@ image: maven:3.9.9-eclipse-temurin-21-alpine
 
 stages:
   - check_version
-  - set_version
   - build
   - publish
-  - revert_version
   - rollout
   - post_checks
   - on_failure
@@ -43,16 +41,6 @@ check_version:
         fi
       fi
 
-set_version:
-  stage: set_version
-  except:
-    - main
-    - release
-  script:
-    - FAILED_STAGE=$CI_JOB_STAGE
-    - JAR_TAG=$(run_mvn.sh help:evaluate -Dexpression=project.version -q -DforceStdout | sed "s/SNAPSHOT/${CI_COMMIT_REF_NAME:0:20}-SNAPSHOT/")
-    - run_mvn.sh versions:set -DnewVersion=$JAR_TAG -DprocessAllModules=true
-
 build:
   stage: build
   services:
@@ -66,6 +54,8 @@ deploy:
   stage: publish
   script:
     - FAILED_STAGE=$CI_JOB_STAGE
+    - JAR_TAG=$(run_mvn.sh help:evaluate -Dexpression=project.version -q -DforceStdout | sed "s/SNAPSHOT/${CI_COMMIT_REF_NAME:0:20}-SNAPSHOT/")
+    - run_mvn.sh versions:set -DnewVersion=$JAR_TAG -DprocessAllModules=true
     - run_mvn.sh deploy -DskipTests -Dmaven.wagon.http.retryHandler.count=3
 
 push_docker_image:
@@ -73,7 +63,7 @@ push_docker_image:
   script:
     - FAILED_STAGE=$CI_JOB_STAGE
     - run_mvn.sh spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3
-    - IMAGE_TAG=$(run_mvn.sh help:evaluate -Dexpression=project.version -q -DforceStdout | sed "s/SNAPSHOT/-SNAPSHOT-${CI_PIPELINE_ID}/")
+    - IMAGE_TAG=$(./gitlab/get_tag_version.sh)
     - docker login -u $DOCKER_REGISTRY_USER -p $DOCKER_REGISTRY_PASSWORD $DOCKER_REGISTRY
     - docker tag $DOCKER_REGISTRY_IMAGE:build-latest $DOCKER_REGISTRY_IMAGE:$IMAGE_TAG
     - docker push $DOCKER_REGISTRY_IMAGE:$IMAGE_TAG
@@ -90,7 +80,7 @@ test_build_deploy_helm_chart:
   stage: publish
   script:
     - FAILED_STAGE=$CI_JOB_STAGE
-    - HELM_CHART_VERSION=$(run_mvn.sh help:evaluate -Dexpression=project.version -q -DforceStdout | sed "s/SNAPSHOT/-SNAPSHOT-${CI_PIPELINE_ID}/")
+    - HELM_CHART_VERSION=$(./gitlab/get_tag_version.sh)
     - ./run_helm_test.sh
     - cd src/main/helm
     - helm package --version=$HELM_CHART_VERSION .
@@ -101,12 +91,6 @@ test_build_deploy_helm_chart:
         curl -u $NEXUS_USER:$NEXUS_PASSWORD -F file=@aggregation-manager-$HELM_CHART_VERSION.tgz https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot
       fi
 
-revert_version:
-  stage: revert_version
-  script:
-    - FAILED_STAGE=$CI_JOB_STAGE
-    - run_mvn.sh versions:revert
-
 trigger_dev_rollout:
   stage: rollout
   only:

gitlab/get_tag_version.sh

+#!/usr/bin/env bash
+
+printf $(run_mvn.sh help:evaluate -Dexpression=project.version -q -DforceStdout | sed "s/SNAPSHOT/${CI_COMMIT_REF_NAME:0:20}-SNAPSHOT-${CI_PIPELINE_ID}/")
\ No newline at end of file