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 3112e94..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
@@ -512,7 +511,6 @@
               <<: *airship-jobs
       - multijob:
           name: opnfv/functest-smoke:{functest_tag}
-          condition: ALWAYS
           projects:
             - name: 'airship-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *airship-jobs
@@ -526,10 +524,26 @@
               <<: *airship-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{functest_tag}
-          condition: ALWAYS
           projects:
             - name: 'airship-opnfv-functest-benchmarking-{tag}-vmtp-run'
               <<: *airship-jobs
+            - name: 'airship-opnfv-functest-benchmarking-{tag}-shaker-run'
+              <<: *airship-jobs
+      - multijob:
+          name: opnfv/functest-vnf:{functest_tag}
+          condition: ALWAYS
+          execution-type: SEQUENTIALLY
+          projects:
+            - name: 'airship-opnfv-functest-vnf-{tag}-cloudify-run'
+              <<: *airship-jobs
+            - name: 'airship-opnfv-functest-vnf-{tag}-cloudify_ims-run'
+              <<: *airship-jobs
+            - name: 'airship-opnfv-functest-vnf-{tag}-heat_ims-run'
+              <<: *airship-jobs
+            - name: 'airship-opnfv-functest-vnf-{tag}-vyos_vrouter-run'
+              <<: *airship-jobs
+            - name: 'airship-opnfv-functest-vnf-{tag}-juju_epc-run'
+              <<: *airship-jobs
 
 - project:
     name: 'airship'