Merge "API and scenario tests for PROMETHEUS listeners."
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index f4dd9db..bd90bea 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -733,12 +733,13 @@
- job:
name: octavia-v2-dsvm-tls-barbican
parent: octavia-v2-dsvm-scenario
+ branches: ^(?!stable/(train|ussuri)).*$
required-projects:
- openstack/barbican
- openstack/diskimage-builder
- openstack/python-barbicanclient
- openstack/barbican-tempest-plugin
- vars:
+ vars: &octavia-v2-dsvm-tls-barbican-vars
tempest_test_regex: ^octavia_tempest_plugin.tests.barbican_scenario.v2
devstack_services:
barbican: true
@@ -756,6 +757,18 @@
- ^octavia_tempest_plugin/tests/(?!barbican_scenario/|\w+\.py).*
- job:
+ name: octavia-v2-dsvm-tls-barbican
+ parent: octavia-v2-dsvm-scenario
+ branches: ^(stable/(train|ussuri)).*$
+ required-projects:
+ - openstack/barbican
+ - openstack/diskimage-builder
+ - openstack/python-barbicanclient
+ - name: openstack/barbican-tempest-plugin
+ override-checkout: 1.6.0
+ vars: *octavia-v2-dsvm-tls-barbican-vars
+
+- job:
name: octavia-v2-dsvm-tls-barbican-stable-yoga
parent: octavia-v2-dsvm-tls-barbican
override-checkout: stable/yoga