From 895d02cb1558883fba967d48ae61b4ecab520155 Mon Sep 17 00:00:00 2001
From: Alex Iribarren <Alex.Iribarren@cern.ch>
Date: Mon, 6 Aug 2018 16:39:08 +0200
Subject: [PATCH] Do some magic

---
 .gitlab-ci.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 472f008..30945f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,19 +72,16 @@ tag:
   before_script:
     - curl https://releases.hashicorp.com/nomad/${NOMAD_VERSION}/nomad_${NOMAD_VERSION}_linux_amd64.zip -o /tmp/nomad.zip
     - unzip /tmp/nomad.zip -d /usr/local/bin/
-    - env
-    - export
-    - for j in *.nomad; do sed -i "s/\$NOMAD_ADDR/${NOMAD_ADDRESS}/g" $j; done
 
 deploy_test:
   <<: *nomad_deps
   stage: deploy_test
   script:
-    - for j in *.nomad; do nomad job validate $j; done
-    - for j in *.nomad; do (nomad job plan -verbose $j || [[ $? -eq 0 || $? -eq 1 ]]) || break; done # plan returns 0 or 1 on success
+    - for j in *.nomad; do nomad job validate <(envsubst < $j); done
+    - for j in *.nomad; do (nomad job plan -verbose <(envsubst < $j) || [[ $? -eq 0 || $? -eq 1 ]]) || break; done # plan returns 0 or 1 on success
 
 deploy:
   <<: *nomad_deps
   stage: deploy
   script:
-    - for j in *.nomad; do nomad job run $j; done
+    - for j in *.nomad; do nomad job run <(envsubst < $j); done
-- 
GitLab