From 34b2e22e94475d178d276933d332bdc0d2772e96 Mon Sep 17 00:00:00 2001 From: Kaspars Skels Date: Fri, 22 Nov 2019 15:39:44 -0600 Subject: [PATCH] Fix Airship deployment job with generic deploy script MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Co-Authored-By: Cédric Ollivier Change-Id: Icd97139905099a2de91ac3e0485785b2a9ddb40f Signed-off-by: Kaspars Skels Signed-off-by: Cédric Ollivier --- jjb/airship/airship.yaml | 4 ++-- jjb/airship/cntt.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml index 69f5beb7e..c07cb4fd5 100644 --- 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 0834bd8c6..275cb4f2e 100644 --- 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 -- 2.16.6