Merge "Update security scan mail publisher for releng utils and xci"

diff --git a/jjb/functest/functest.ovn.yaml b/jjb/functest/functest.ovn.yaml
index 3fde134..76a8eb7 100644 (file)
--- a/jjb/functest/functest.ovn.yaml
+++ b/jjb/functest/functest.ovn.yaml
@@ -318,6 +318,7 @@
       - neutron-tempest-plugin-api
       - tempest_cinder
       - tempest_keystone
+      - tempest_heat
       - rally_sanity
       - refstack_defcore
       - refstack_compute
@@ -333,6 +334,12 @@
       - 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
@@ -532,6 +539,8 @@
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_keystone-run'
               <<: *functest-ovn-jobs
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_heat-run'
+              <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -863,6 +872,8 @@
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_keystone-run'
               <<: *functest-ovn-jobs
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_heat-run'
+              <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -1077,6 +1088,8 @@
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_keystone-run'
               <<: *functest-ovn-jobs
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_heat-run'
+              <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_defcore-run'

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 313221b..8d7e7d7 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -329,6 +329,7 @@
       - neutron-tempest-plugin-api
       - tempest_cinder
       - tempest_keystone
+      - tempest_heat
       - rally_sanity
       - refstack_defcore
       - refstack_compute
@@ -344,6 +345,12 @@
       - 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
@@ -541,6 +548,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_heat-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -867,6 +876,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_heat-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -1081,6 +1092,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_heat-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'