X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fairship%2Fcntt.yaml;h=adc91fd8b753ccb25260b2a20728e7511e5ed880;hb=83e216498dbeffc7777cdafff97da7302e38cfbe;hp=01fe9972e1a74b0a6f7834411c051b309d2e5100;hpb=eef406411b743963a9d60c10667671fc3a1b6296;p=releng.git

diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index 01fe9972e..adc91fd8b 100644
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -311,7 +311,7 @@
     <<: *cntt-params
     container: 'functest-smoke'
     test:
-      - neutron-tempest-plugin-api
+      - tempest_neutron
       - tempest_cinder
       - tempest_keystone
       - tempest_heat
@@ -321,10 +321,9 @@
       - tempest_scenario
       - tempest_slow
       - patrole
-      - neutron_trunk
       - networking-bgpvpn
       - networking-sfc
-      - barbican
+      - tempest_barbican
     jobs:
       - 'cntt-{repo}-{container}-{tag}-{test}-run'
 
@@ -333,9 +332,10 @@
     <<: *cntt-params
     container: 'functest-smoke-cntt'
     test:
-      - neutron-tempest-plugin-api-cntt
+      - tempest_neutron_cntt
       - tempest_cinder_cntt
       - tempest_keystone_cntt
+      - tempest_heat_cntt
       - rally_sanity_cntt
       - tempest_full_cntt
       - tempest_scenario_cntt
@@ -420,6 +420,7 @@
 
 - job-template:
     name: 'cntt-{tag}-daily'
+    disabled: true
     project-type: multijob
     triggers:
       - timed: '@daily'
@@ -510,7 +511,7 @@
           name: opnfv/functest-smoke:{functest_tag}
           condition: ALWAYS
           projects:
-            - name: 'cntt-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_neutron-run'
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_cinder-run'
               <<: *cntt-jobs
@@ -530,24 +531,24 @@
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *cntt-jobs
-            - name: 'cntt-opnfv-functest-smoke-{tag}-neutron_trunk-run'
-              <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-networking-sfc-run'
               <<: *cntt-jobs
-            - name: 'cntt-opnfv-functest-smoke-{tag}-barbican-run'
+            - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_barbican-run'
               <<: *cntt-jobs
       - multijob:
           name: opnfv/functest-smoke-cntt:{tag}
           condition: ALWAYS
           projects:
-            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-cntt-run'
+            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_neutron_cntt-run'
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run'
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_cntt-run'
               <<: *cntt-jobs
+            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_heat_cntt-run'
+              <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-rally_sanity_cntt-run'
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_full_cntt-run'
@@ -622,6 +623,7 @@
 
 - job-template:
     name: 'cntt-{tag}-gate'
+    disabled: true
     project-type: multijob
     triggers:
       - cntt-patchset-created:
@@ -711,7 +713,7 @@
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-networking-sfc-run'
               <<: *cntt-jobs
-            - name: 'cntt-opnfv-functest-smoke-{tag}-barbican-run'
+            - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_barbican-run'
               <<: *cntt-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{functest_tag}