summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2020-04-11 18:19:29 +0000
committerGerrit Code Review <gerrit@opnfv.org>2020-04-11 18:19:29 +0000
commiteef406411b743963a9d60c10667671fc3a1b6296 (patch)
tree5ecd21968d6a477957f4740c2b578c9b40ecef1b
parent7b2973a114f0aa3c49b562ca5c6ee479bf50f083 (diff)
parentd9abf4a3b6fc316c4134fa21fd3b41ae3c0eea0a (diff)
Merge "Add tempest_horizon in Hunter gates"
-rw-r--r--jjb/airship/airship.yaml3
-rw-r--r--jjb/airship/cntt.yaml3
-rw-r--r--jjb/functest/functest.ovn.yaml3
-rw-r--r--jjb/functest/functest.yaml3
4 files changed, 6 insertions, 6 deletions
diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 58ae3857d..c8dca8a09 100644
--- 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'
@@ -444,6 +445,8 @@
<<: *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
diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index 50df86a5b..01fe9972e 100644
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -302,6 +302,7 @@
- cinder_test
- odl
- tempest_smoke
+ - tempest_horizon
jobs:
- 'cntt-{repo}-{container}-{tag}-{test}-run'
@@ -503,6 +504,8 @@
<<: *cntt-jobs
- name: 'cntt-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
<<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
+ <<: *cntt-jobs
- multijob:
name: opnfv/functest-smoke:{functest_tag}
condition: ALWAYS
diff --git a/jjb/functest/functest.ovn.yaml b/jjb/functest/functest.ovn.yaml
index b474c4939..f220d0c95 100644
--- a/jjb/functest/functest.ovn.yaml
+++ b/jjb/functest/functest.ovn.yaml
@@ -304,9 +304,6 @@
- odl
- tempest_smoke
- tempest_horizon
- exclude:
- - tag: hunter
- test: tempest_horizon
jobs:
- 'functest-ovn-{repo}-{container}-{tag}-{test}-run'
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index bd6b844e1..63e04e50f 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -315,9 +315,6 @@
- odl
- tempest_smoke
- tempest_horizon
- exclude:
- - tag: hunter
- test: tempest_horizon
jobs:
- 'functest-{repo}-{container}-{tag}-{test}-run'