Merge "Add tempest_heat in gates"

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index b679f3e..58ae385 100644 (file)
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -287,6 +287,7 @@
       - neutron-tempest-plugin-api
       - tempest_cinder
       - tempest_keystone
+      - tempest_heat
       - rally_sanity
       - refstack_defcore
       - tempest_full
@@ -453,6 +454,8 @@
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest_keystone-run'
               <<: *airship-jobs
+            - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest_heat-run'
+              <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-refstack_defcore-run'

diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index 1fdf112..50df86a 100644 (file)
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -313,6 +313,7 @@
       - neutron-tempest-plugin-api
       - tempest_cinder
       - tempest_keystone
+      - tempest_heat
       - rally_sanity
       - refstack_defcore
       - tempest_full
@@ -512,6 +513,8 @@
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_keystone-run'
               <<: *cntt-jobs
+            - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_heat-run'
+              <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-refstack_defcore-run'

diff --git a/jjb/functest/functest.ovn.yaml b/jjb/functest/functest.ovn.yaml
index ab1ea4c..b474c49 100644 (file)
--- a/jjb/functest/functest.ovn.yaml
+++ b/jjb/functest/functest.ovn.yaml
@@ -334,12 +334,6 @@
       - barbican
       - octavia
     exclude:
-      - tag: jerma
-        test: tempest_heat
-      - tag: iruya
-        test: tempest_heat
-      - tag: hunter
-        test: tempest_heat
       - tag: latest
         test: refstack_defcore
       - tag: jerma

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index e16c02b..bd6b844 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -345,12 +345,6 @@
       - barbican
       - octavia
     exclude:
-      - tag: jerma
-        test: tempest_heat
-      - tag: iruya
-        test: tempest_heat
-      - tag: hunter
-        test: tempest_heat
       - tag: latest
         test: refstack_defcore
       - tag: jerma