From f09112fba681d265c66ed9853ae9aae683a36bf0 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 11 Apr 2020 11:44:43 +0200
Subject: Add tempest_heat in gates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It was backported in all Functest active branches (CNTT).

Change-Id: I996912fd1677838f4513fd77566eb3ee8702c90a
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 jjb/airship/airship.yaml       | 3 +++
 jjb/airship/cntt.yaml          | 3 +++
 jjb/functest/functest.ovn.yaml | 6 ------
 jjb/functest/functest.yaml     | 6 ------
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index b679f3ebb..58ae3857d 100644
--- 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 1fdf112ee..50df86a5b 100644
--- 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 ab1ea4c4d..b474c4939 100644
--- 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 e16c02b68..bd6b844e1 100644
--- 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
-- 
cgit 1.2.3-korg