summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/airship/airship.yaml9
-rw-r--r--jjb/airship/cntt.yaml9
-rw-r--r--jjb/functest/functest.ovn.yaml42
-rw-r--r--jjb/functest/functest.yaml42
4 files changed, 70 insertions, 32 deletions
diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index aebafaf53..d54f8cfb0 100644
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -295,10 +295,9 @@
- tempest_scenario
- tempest_slow
- patrole
- - neutron_trunk
- networking-bgpvpn
- networking-sfc
- - barbican
+ - tempest_barbican
jobs:
- 'airship-{repo}-{container}-{tag}-{test}-run'
@@ -471,13 +470,11 @@
<<: *airship-jobs
- name: 'airship-opnfv-functest-smoke-{tag}-patrole-run'
<<: *airship-jobs
- - name: 'airship-opnfv-functest-smoke-{tag}-neutron_trunk-run'
- <<: *airship-jobs
- name: 'airship-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
<<: *airship-jobs
- name: 'airship-opnfv-functest-smoke-{tag}-networking-sfc-run'
<<: *airship-jobs
- - name: 'airship-opnfv-functest-smoke-{tag}-barbican-run'
+ - name: 'airship-opnfv-functest-smoke-{tag}-tempest_barbican-run'
<<: *airship-jobs
- multijob:
name: opnfv/functest-benchmarking:{functest_tag}
@@ -618,7 +615,7 @@
<<: *airship-jobs
- name: 'airship-opnfv-functest-smoke-{tag}-networking-sfc-run'
<<: *airship-jobs
- - name: 'airship-opnfv-functest-smoke-{tag}-barbican-run'
+ - name: 'airship-opnfv-functest-smoke-{tag}-tempest_barbican-run'
<<: *airship-jobs
- multijob:
name: opnfv/functest-benchmarking:{functest_tag}
diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index 1a65855cf..2d1663bd9 100644
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -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'
@@ -531,13 +530,11 @@
<<: *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}
@@ -714,7 +711,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}
diff --git a/jjb/functest/functest.ovn.yaml b/jjb/functest/functest.ovn.yaml
index 2518dc9e9..39a5a1894 100644
--- a/jjb/functest/functest.ovn.yaml
+++ b/jjb/functest/functest.ovn.yaml
@@ -331,19 +331,39 @@
- neutron_trunk
- networking-bgpvpn
- networking-sfc
- - barbican
- - octavia
+ - tempest_barbican
+ - tempest_octavia
exclude:
- tag: latest
test: refstack_defcore
+ - tag: latest
+ test: neutron_trunk
+ - tag: latest
+ test: networking-bgpvpn
+ - tag: latest
+ test: networking-sfc
- tag: kali
test: refstack_defcore
+ - tag: kali
+ test: neutron_trunk
+ - tag: kali
+ test: networking-bgpvpn
+ - tag: kali
+ test: networking-sfc
- tag: jerma
test: refstack_defcore
+ - tag: jerma
+ test: neutron_trunk
+ - tag: jerma
+ test: networking-bgpvpn
+ - tag: jerma
+ test: networking-sfc
- tag: iruya
test: refstack_defcore
- tag: iruya
- test: octavia
+ test: neutron_trunk
+ - tag: iruya
+ test: tempest_octavia
- tag: hunter
test: refstack_compute
- tag: hunter
@@ -351,7 +371,9 @@
- tag: hunter
test: refstack_platform
- tag: hunter
- test: octavia
+ test: tempest_octavia
+ - tag: hunter
+ test: neutron_trunk
jobs:
- 'functest-ovn-{repo}-{container}-{tag}-{test}-run'
@@ -562,9 +584,9 @@
<<: *functest-ovn-jobs
- name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-sfc-run'
<<: *functest-ovn-jobs
- - name: 'functest-ovn-opnfv-functest-smoke-{tag}-barbican-run'
+ - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_barbican-run'
<<: *functest-ovn-jobs
- - name: 'functest-ovn-opnfv-functest-smoke-{tag}-octavia-run'
+ - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_octavia-run'
<<: *functest-ovn-jobs
- multijob:
name: opnfv/functest-smoke-cntt:{tag}
@@ -898,9 +920,9 @@
<<: *functest-ovn-jobs
- name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-sfc-run'
<<: *functest-ovn-jobs
- - name: 'functest-ovn-opnfv-functest-smoke-{tag}-barbican-run'
+ - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_barbican-run'
<<: *functest-ovn-jobs
- - name: 'functest-ovn-opnfv-functest-smoke-{tag}-octavia-run'
+ - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_octavia-run'
<<: *functest-ovn-jobs
- multijob:
name: opnfv/functest-smoke-cntt:{tag}
@@ -1116,9 +1138,9 @@
<<: *functest-ovn-jobs
- name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-sfc-run'
<<: *functest-ovn-jobs
- - name: 'functest-ovn-opnfv-functest-smoke-{tag}-barbican-run'
+ - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_barbican-run'
<<: *functest-ovn-jobs
- - name: 'functest-ovn-opnfv-functest-smoke-{tag}-octavia-run'
+ - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_octavia-run'
<<: *functest-ovn-jobs
- multijob:
name: opnfv/functest-smoke-cntt:{tag}
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index c17fb3ae9..7b921c600 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -343,19 +343,39 @@
- neutron_trunk
- networking-bgpvpn
- networking-sfc
- - barbican
- - octavia
+ - tempest_barbican
+ - tempest_octavia
exclude:
- tag: latest
test: refstack_defcore
+ - tag: latest
+ test: neutron_trunk
+ - tag: latest
+ test: networking-bgpvpn
+ - tag: latest
+ test: networking-sfc
- tag: kali
test: refstack_defcore
+ - tag: kali
+ test: neutron_trunk
+ - tag: kali
+ test: networking-bgpvpn
+ - tag: kali
+ test: networking-sfc
- tag: jerma
test: refstack_defcore
+ - tag: jerma
+ test: neutron_trunk
+ - tag: jerma
+ test: networking-bgpvpn
+ - tag: jerma
+ test: networking-sfc
- tag: iruya
test: refstack_defcore
- tag: iruya
- test: octavia
+ test: neutron_trunk
+ - tag: iruya
+ test: tempest_octavia
- tag: hunter
test: refstack_compute
- tag: hunter
@@ -363,7 +383,9 @@
- tag: hunter
test: refstack_platform
- tag: hunter
- test: octavia
+ test: tempest_octavia
+ - tag: hunter
+ test: neutron_trunk
jobs:
- 'functest-{repo}-{container}-{tag}-{test}-run'
@@ -572,9 +594,9 @@
<<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-networking-sfc-run'
<<: *functest-jobs
- - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
+ - name: 'functest-opnfv-functest-smoke-{tag}-tempest_barbican-run'
<<: *functest-jobs
- - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
+ - name: 'functest-opnfv-functest-smoke-{tag}-tempest_octavia-run'
<<: *functest-jobs
- multijob:
name: opnfv/functest-smoke-cntt:{tag}
@@ -903,9 +925,9 @@
<<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-networking-sfc-run'
<<: *functest-jobs
- - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
+ - name: 'functest-opnfv-functest-smoke-{tag}-tempest_barbican-run'
<<: *functest-jobs
- - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
+ - name: 'functest-opnfv-functest-smoke-{tag}-tempest_octavia-run'
<<: *functest-jobs
- multijob:
name: opnfv/functest-smoke-cntt:{tag}
@@ -1121,9 +1143,9 @@
<<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-networking-sfc-run'
<<: *functest-jobs
- - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
+ - name: 'functest-opnfv-functest-smoke-{tag}-tempest_barbican-run'
<<: *functest-jobs
- - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
+ - name: 'functest-opnfv-functest-smoke-{tag}-tempest_octavia-run'
<<: *functest-jobs
- multijob:
name: opnfv/functest-smoke-cntt:{tag}