From 6b716a4bbcb07bd8764c746fb57824b9e5cc4f65 Mon Sep 17 00:00:00 2001
From: sanne <sanne.raymaekers@gmail.com>
Date: Wed, 19 Jan 2022 11:14:50 +0100
Subject: [PATCH] tools/appsre-build-worker-packer: Fix branch parsing on
 jenkins

---
 tools/appsre-build-worker-packer.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/appsre-build-worker-packer.sh b/tools/appsre-build-worker-packer.sh
index e05922c78..ce773a382 100755
--- a/tools/appsre-build-worker-packer.sh
+++ b/tools/appsre-build-worker-packer.sh
@@ -7,13 +7,16 @@ COMMIT_SHA=$(git rev-parse HEAD)
 COMMIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 ON_JENKINS=true
 
-# Use CI variables if available
+# Use gitlab CI variables if available
 if [ -n "$CI_COMMIT_SHA" ]; then
     ON_JENKINS=false
     COMMIT_SHA="$CI_COMMIT_SHA"
 fi
 if [ -n "$CI_COMMIT_BRANCH" ]; then
     COMMIT_BRANCH="$CI_COMMIT_BRANCH"
+elif [ -n "$GIT_BRANCH" ]; then
+    # Use jenkins CI variables if available
+    COMMIT_BRANCH="${GIT_BRANCH#*/}"
 fi
 
 if [ "$ON_JENKINS" = false ]; then