From b56caf0105f139b4f8d2a17584bc7ae1c327e20e Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Wed, 5 Mar 2025 09:23:03 +0100
Subject: [PATCH] use environemnt variable for branch

---
 .gitlab-ci.yml                            | 10 +++++-----
 gitlab/build_and_push_docker_image.sh     |  5 ++---
 gitlab/check_version.sh                   |  7 +++----
 gitlab/deploy_maven_artifact.sh           |  4 +---
 gitlab/deploy_sbom_to_dependency_track.sh |  3 +--
 gitlab/test_build_deploy_helm_chart.sh    |  5 ++---
 6 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ceaf298..bd134f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ default:
 check_version:
   stage: check_version
   script:
-    - ./gitlab/check_version.sh $CI_COMMIT_REF_NAME
+    - ./gitlab/check_version.sh
 
 build:
   stage: build
@@ -38,7 +38,7 @@ build:
 deploy:
   stage: publish
   script:
-    - ./gitlab/deploy_maven_artifact.sh $CI_COMMIT_REF_NAME
+    - ./gitlab/deploy_maven_artifact.sh
 
 push_docker_image:
   stage: publish
@@ -46,7 +46,7 @@ push_docker_image:
     - name: docker:dind
       command: ["--tls=false"]
   script:
-    - ./gitlab/build_and_push_docker_image.sh $CI_COMMIT_REF_NAME
+    - ./gitlab/build_and_push_docker_image.sh
 
 test_build_deploy_helm_chart:
   stage: publish
@@ -55,7 +55,7 @@ test_build_deploy_helm_chart:
     - ./gitlab/configure_git.sh
     - ./gitlab/configure_helm.sh
   script:
-    - ./gitlab/test_build_deploy_helm_chart.sh $CI_COMMIT_REF_NAME $SERVICE_NAME
+    - ./gitlab/test_build_deploy_helm_chart.sh $SERVICE_NAME
 
 trigger_dev_rollout:
   stage: rollout
@@ -82,7 +82,7 @@ trigger_test_rollout:
 deploy_sbom_to_dependency_track:
   stage: post_checks
   script:
-    - ./gitlab/deploy_sbom_to_dependency_track.sh $CI_COMMIT_REF_NAME
+    - ./gitlab/deploy_sbom_to_dependency_track.sh
 
 sonar_checks:
   stage: post_checks
diff --git a/gitlab/build_and_push_docker_image.sh b/gitlab/build_and_push_docker_image.sh
index 2ff1e35..e14429e 100755
--- a/gitlab/build_and_push_docker_image.sh
+++ b/gitlab/build_and_push_docker_image.sh
@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
 
-branch="$1"
 export IMAGE_TAG=$(./gitlab/get_tag_version.sh)
 export DOCKER_REGISTRY_IMAGE=$DOCKER_REGISTRY_IMAGE
 
-if [[ "$branch" == "main" ]]; then
+if [[ "$CI_COMMIT_REF_NAME" == "main" ]]; then
   profile="main"
-elif [[ "$branch" == "release" ]]; then
+elif [[ "$CI_COMMIT_REF_NAME" == "release" ]]; then
   profile="release"
 else
   profile="dev"
diff --git a/gitlab/check_version.sh b/gitlab/check_version.sh
index 7134ed0..6edafe4 100755
--- a/gitlab/check_version.sh
+++ b/gitlab/check_version.sh
@@ -1,18 +1,17 @@
 #!/usr/bin/env bash
 
-branch="$1"
 release_regex='\d+.\d+.\d+'
 snapshot_regex='\d+.\d+.\d+-SNAPSHOT'
 rootVersion=$(run_mvn.sh help:evaluate -Dexpression=project.version -q -DforceStdout)
 
-if [[ "$branch" == "release" ]]; then
+if [[ "$CI_COMMIT_REF_NAME" == "release" ]]; then
     if ! [[ "$rootVersion" =~ $release_regex ]]; then
-        echo "Keine Release Version für Branch $branch."
+        echo "Keine Release Version für Branch $CI_COMMIT_REF_NAME."
         exit 1
     fi
 else
     if ! [[ "$rootVersion" =~ $snapshot_regex ]]; then
-        echo "Keine Snapshot Version für Branch $branch."
+        echo "Keine Snapshot Version für Branch $CI_COMMIT_REF_NAME."
         exit 1
     fi
 fi
\ No newline at end of file
diff --git a/gitlab/deploy_maven_artifact.sh b/gitlab/deploy_maven_artifact.sh
index b5762f6..e6c4ef8 100755
--- a/gitlab/deploy_maven_artifact.sh
+++ b/gitlab/deploy_maven_artifact.sh
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-branch="$1"
-
-jar_version=$(run_mvn.sh help:evaluate -Dexpression=project.version -q -DforceStdout | sed "s/SNAPSHOT/${branch:0:20}-SNAPSHOT/")
+jar_version=$(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_version -DprocessAllModules=true
 run_mvn.sh deploy -DskipTests -Dmaven.wagon.http.retryHandler.count=3
\ No newline at end of file
diff --git a/gitlab/deploy_sbom_to_dependency_track.sh b/gitlab/deploy_sbom_to_dependency_track.sh
index 694d5eb..5fcdb5e 100755
--- a/gitlab/deploy_sbom_to_dependency_track.sh
+++ b/gitlab/deploy_sbom_to_dependency_track.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-branch="$1"
-image_tag="${branch}-$(run_mvn.sh help:evaluate -Dexpression=project.version -q -DforceStdout)"
+image_tag=$(./gitlab/get_tag_version.sh)
 run_mvn.sh -P ci-build package -DskipTests
 run_mvn.sh io.github.pmckeown:dependency-track-maven-plugin:upload-bom -Ddependency-track.apiKey=$dependency_track_api_key -Ddependency-track.projectVersion=$image_tag -Ddependency-track.dependencyTrackBaseUrl=https://dependency-track.ozg-sh.de
diff --git a/gitlab/test_build_deploy_helm_chart.sh b/gitlab/test_build_deploy_helm_chart.sh
index 55faa73..b811f80 100755
--- a/gitlab/test_build_deploy_helm_chart.sh
+++ b/gitlab/test_build_deploy_helm_chart.sh
@@ -1,14 +1,13 @@
 #!/usr/bin/env bash
 
-branch="$1"
-service_name="$2"
+service_name="$1"
 
 helm_chart_version=$(./gitlab/get_tag_version.sh)
 ./run_helm_test.sh
 cd src/main/helm
 helm package --version=$helm_chart_version .
 
-if [[ "$branch" == "release" ]]; then
+if [[ "$CI_COMMIT_REF_NAME" == "release" ]]; then
   repository=ozg-base-apps
 else
   repository=ozg-base-apps-snapshot
-- 
GitLab