Merge branch 'dev' into 'master'

Dev

See merge request linuxsupport/containers/reposync_test!3

.gitlab-ci.yml

@@ -6,7 +6,7 @@ variables:
   VAULT_ADDR: "https://${CLUSTER_ADDR}:8200"
 
 before_script:
-  - if [ $CI_COMMIT_REF_NAME == 'master' ]; then PREFIX='PROD_'; else PREFIX='DEV_'; fi
+  - if [[ $CI_COMMIT_REF_NAME == 'master' || -n ${CI_COMMIT_TAG+x} ]]; then PREFIX='PROD_'; else PREFIX='DEV_'; fi
   - eval 'vars=${!'"$PREFIX"'@}'
   - for v in $vars; do eval 'export '"${v#$PREFIX}"'=$'$v; done
 
@@ -81,7 +81,7 @@ stop_testing:
   script:
     - *nomad_deps
     - export JOB_PREFIX="${DEV_JOB_PREFIX}"
-    - for j in *.nomad; do echo -e "\n${j}:"; JOB=`grep task <(envsubst < $j) | sed 's/.*"\([^"]*\)".*/\1/'`; nomad job stop -purge ${JOB}; done
+    - for j in *.nomad; do JOB=`grep task <(envsubst < $j) | sed 's/.*"\([^"]*\)".*/\1/'`; echo -e "\nPurging job ${JOB}:"; nomad job stop -purge ${JOB}; done
   only:
     - tags
     - master