Run K8s cnf at the end

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

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 0767159..d54f8cf 100644 (file)
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -276,6 +276,7 @@
       - cinder_test
       - odl
       - tempest_smoke
+      - tempest_horizon
     jobs:
       - 'airship-{repo}-{container}-{tag}-{test}-run'
 
@@ -284,19 +285,19 @@
     <<: *airship-params
     container: 'functest-smoke'
     test:
-      - neutron-tempest-plugin-api
+      - tempest_neutron
       - tempest_cinder
       - tempest_keystone
+      - tempest_heat
       - rally_sanity
       - refstack_defcore
       - tempest_full
       - tempest_scenario
       - tempest_slow
       - patrole
-      - neutron_trunk
       - networking-bgpvpn
       - networking-sfc
-      - barbican
+      - tempest_barbican
     jobs:
       - 'airship-{repo}-{container}-{tag}-{test}-run'
 
@@ -443,15 +444,19 @@
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *airship-jobs
+            - name: 'airship-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
+              <<: *airship-jobs
       - multijob:
           name: opnfv/functest-smoke:{functest_tag}
           condition: ALWAYS
           projects:
-            - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_neutron-run'
+              <<: *airship-jobs
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_cinder-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest_cinder-run'
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_keystone-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest_keystone-run'
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_heat-run'
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *airship-jobs
@@ -465,13 +470,11 @@
               <<: *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'
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-networking-sfc-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-barbican-run'
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_barbican-run'
               <<: *airship-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{functest_tag}
@@ -608,13 +611,11 @@
           projects:
             - name: 'airship-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-neutron_trunk-run'
-              <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-networking-sfc-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-barbican-run'
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_barbican-run'
               <<: *airship-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{functest_tag}