summaryrefslogtreecommitdiffstats
path: root/jjb/airship
diff options
context:
space:
mode:
authorKaspars Skels <kaspars.skels@att.com>2019-11-22 15:39:44 -0600
committerCédric Ollivier <cedric.ollivier@orange.com>2019-11-23 00:26:56 +0100
commit34b2e22e94475d178d276933d332bdc0d2772e96 (patch)
tree7d0832df7081a8184310f7a2ce001f57a3c2a453 /jjb/airship
parent0d088b8386b4916f7e6fdf47eaac7653d229b85e (diff)
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>
Diffstat (limited to 'jjb/airship')
-rw-r--r--jjb/airship/airship.yaml4
-rw-r--r--jjb/airship/cntt.yaml4
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