Run Shaker and VNFs in Airship gates

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

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index f6839a7..49ea4fa 100644 (file)
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -486,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
@@ -510,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'
@@ -538,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'