Fix Airship deployment job with generic deploy script

Co-Authored-By: Cédric Ollivier <cedric.ollivier@orange.com>
Change-Id: Icd97139905099a2de91ac3e0485785b2a9ddb40f
Signed-off-by: Kaspars Skels <kaspars.skels@att.com>
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 69f5beb..c07cb4f 100644 (file)
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -61,7 +61,7 @@
           fi
           sudo docker run --rm \
             -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
-            -e NODE_NAME=intel-pod17 \
+            -e NODE_NAME=$slave \
             -e INSTALLER_TYPE=airship \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -e DEBUG=True \
@@ -100,7 +100,7 @@
       - shell: |
           set +x
           export TERM_OPTS=" "
-          sudo -H -E -u ubuntu bash -c 'tools/deploy.sh deploy_site'
+          sudo -H -E -u ubuntu bash -c 'tools/deploy.sh $slave deploy_site'
 
 - scm:
     name: airship-scm

diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index 0834bd8..275cb4f 100644 (file)
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -61,7 +61,7 @@
           fi
           sudo docker run --rm \
             -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
-            -e NODE_NAME=intel-pod10 \
+            -e NODE_NAME=$slave \
             -e INSTALLER_TYPE=cntt \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -e DEBUG=True \
@@ -100,7 +100,7 @@
       - shell: |
           set +x
           export TERM_OPTS=" "
-          sudo -H -E -u ubuntu bash -c 'tools/deploy.sh deploy_site'
+          sudo -H -E -u ubuntu bash -c 'tools/deploy.sh $slave deploy_site'
 
 - scm:
     name: cntt-scm