X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fairship%2Fairship.yaml;h=49ea4fa92a34438930ecbd9378adfecf5130bc4d;hb=ba48a39d65c472deff98d6b0df4c3e92e4b28870;hp=7bd659c0b2503155469cb766630c37d4b3e74de5;hpb=1f93df139b36df565a538c28ef1b0fbfe0a0f576;p=releng.git

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 7bd659c0b..49ea4fa92 100644
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -98,7 +98,8 @@
     builders:
       - shell: |
           set +x
-          sudo -u ubuntu tools/deploy.sh deploy_site
+          export TERM_OPTS=" "
+          sudo -H -E -u ubuntu bash -c 'tools/deploy.sh deploy_site'
 
 - scm:
     name: airship-scm
@@ -485,7 +486,6 @@
               <<: *airship-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{functest_tag}
-          condition: ALWAYS
           projects:
             - name: 'airship-opnfv-functest-healthcheck-{tag}-connection_check-run'
               <<: *airship-jobs
@@ -509,24 +509,11 @@
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
-              <<: *airship-jobs
       - multijob:
           name: opnfv/functest-smoke:{functest_tag}
-          condition: ALWAYS
           projects:
-            - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
-              <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-rally_sanity-run'
-              <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-refstack_defcore-run'
-              <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_full-run'
-              <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-patrole-run'
-              <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
@@ -537,12 +524,7 @@
               <<: *airship-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{functest_tag}
-          condition: ALWAYS
           projects:
-            - name: 'airship-opnfv-functest-benchmarking-{tag}-rally_full-run'
-              <<: *airship-jobs
-            - name: 'airship-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
-              <<: *airship-jobs
             - name: 'airship-opnfv-functest-benchmarking-{tag}-vmtp-run'
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-benchmarking-{tag}-shaker-run'