Fix Airship deployment job with generic deploy script

[releng.git] / jjb / airship / cntt.yaml

diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index c01ded1..275cb4f 100644 (file)
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -61,11 +61,12 @@
           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 \
             -e EXTERNAL_NETWORK=public \
+            -e DEPLOY_SCENARIO=os-nosdn-nofeature-ha \
             -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
             -v /home/opnfv/functest/images:/home/opnfv/functest/images \
             -v /home/opnfv/functest/tempest_conf.yaml:/usr/lib/python2.7/\
@@ -99,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
@@ -119,6 +120,7 @@
 
 - job-template:
     name: 'cntt-deploy-daily-{tag}'
+    disabled: true
     parameters:
       - cntt-slave:
           slave: '{slave}'
@@ -444,6 +446,7 @@
 - job-template:
     name: 'cntt-{tag}-gate'
     project-type: multijob
+    disabled: true
     triggers:
       - cntt-patchset-created:
           branch: '{branch}'