From 4521517d1f75e3ed6771c564f78e0b34b8a2f51a Mon Sep 17 00:00:00 2001
From: Oliver Smith <osmith@sysmocom.de>
Date: Fri, 26 Feb 2021 13:02:56 +0100
Subject: jobs/ttcn3: tweak shell cmd

Move 'cd' and './jenkins.sh' commands towards the end, so they are not
repeated in the case block of each pattern. This is in preparation for
the ggsn kernel mod test, which will need new patterns.

Related: OS#3208
Change-Id: I0fac24b961b1abb09317144ec2f65d4e21eb70c2
---
 jobs/ttcn3-testsuites.yml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml
index d787957..59f0397 100644
--- a/jobs/ttcn3-testsuites.yml
+++ b/jobs/ttcn3-testsuites.yml
@@ -222,24 +222,30 @@
     builders:
       - shell: |-
           export REGISTRY_HOST="registry.osmocom.org"
+
+          # Translate job name to docker-playground dir and relevant
+          # environment variables
           case "{job-name}" in
               TTCN3-centos-*-latest)
-                  cd "$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/ | sed s/\-latest$//)"
-                  IMAGE_SUFFIX="latest-centos8" ./jenkins.sh
+                  DIR="$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/ | sed s/\-latest$//)"
+                  export IMAGE_SUFFIX="latest-centos8"
                   ;;
               TTCN3-centos-*)
-                  cd "$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/)"
-                  IMAGE_SUFFIX="master-centos8" ./jenkins.sh
+                  DIR="$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/)"
+                  export IMAGE_SUFFIX="master-centos8"
                   ;;
               *-latest)
-                  cd "$(echo "{job-name}" | sed s/\-latest$//)"
-                  IMAGE_SUFFIX="latest" ./jenkins.sh
+                  DIR="$(echo "{job-name}" | sed s/\-latest$//)"
+                  export IMAGE_SUFFIX="latest"
                   ;;
               *)
-                  cd "{job-name}"
-                  IMAGE_SUFFIX="master" ./jenkins.sh
+                  DIR="{job-name}"
+                  export IMAGE_SUFFIX="master"
                   ;;
           esac
+
+          cd "$DIR"
+          ./jenkins.sh
     scm:
       - git:
           branches:
-- 
cgit v1.2.3