Merge "Add waiting OPERATION_STATUS for the third listener in tests."
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 98bbd88..ef613aa 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -530,6 +530,11 @@
USE_PYTHON3: False
- job:
+ name: octavia-v2-dsvm-noop-api-stable-yoga
+ parent: octavia-v2-dsvm-noop-api
+ override-checkout: stable/yoga
+
+- job:
name: octavia-v2-dsvm-noop-api-stable-xena
parent: octavia-v2-dsvm-noop-api
override-checkout: stable/xena
@@ -545,12 +550,6 @@
override-checkout: stable/victoria
- job:
- name: octavia-v2-dsvm-noop-api-stable-ussuri
- parent: octavia-v2-dsvm-noop-api
- nodeset: octavia-single-node-ubuntu-bionic
- override-checkout: stable/ussuri
-
-- job:
name: octavia-v2-dsvm-scenario
parent: octavia-dsvm-live-base
vars:
@@ -605,6 +604,11 @@
override-checkout: 2.30.0
- job:
+ name: octavia-v2-dsvm-scenario-stable-yoga
+ parent: octavia-v2-dsvm-scenario
+ override-checkout: stable/yoga
+
+- job:
name: octavia-v2-dsvm-scenario-stable-xena
parent: octavia-v2-dsvm-scenario
override-checkout: stable/xena
@@ -618,12 +622,6 @@
parent: octavia-v2-dsvm-scenario
override-checkout: stable/victoria
-- job:
- name: octavia-v2-dsvm-scenario-stable-ussuri
- parent: octavia-v2-dsvm-scenario
- nodeset: octavia-single-node-ubuntu-bionic
- override-checkout: stable/ussuri
-
# Legacy jobs for the transition to the act-stdby two node jobs
- job:
name: octavia-v2-dsvm-scenario-two-node
@@ -760,6 +758,11 @@
- ^octavia_tempest_plugin/tests/(?!barbican_scenario/|\w+\.py).*
- job:
+ name: octavia-v2-dsvm-tls-barbican-stable-yoga
+ parent: octavia-v2-dsvm-tls-barbican
+ override-checkout: stable/yoga
+
+- job:
name: octavia-v2-dsvm-tls-barbican-stable-xena
parent: octavia-v2-dsvm-tls-barbican
override-checkout: stable/xena
@@ -824,6 +827,11 @@
override-checkout: 2.30.0
- job:
+ name: octavia-v2-dsvm-spare-pool-stable-yoga
+ parent: octavia-v2-dsvm-spare-pool
+ override-checkout: stable/yoga
+
+- job:
name: octavia-v2-dsvm-spare-pool-stable-xena
parent: octavia-v2-dsvm-spare-pool
override-checkout: stable/xena
@@ -839,12 +847,6 @@
override-checkout: stable/victoria
- job:
- name: octavia-v2-dsvm-spare-pool-stable-ussuri
- parent: octavia-v2-dsvm-spare-pool
- nodeset: octavia-single-node-ubuntu-bionic
- override-checkout: stable/ussuri
-
-- job:
name: octavia-v2-dsvm-cinder-amphora
parent: octavia-v2-dsvm-scenario
required-projects:
@@ -974,6 +976,11 @@
tox_envlist: all
- job:
+ name: octavia-v2-act-stdby-dsvm-scenario-stable-yoga
+ parent: octavia-v2-act-stdby-dsvm-scenario
+ override-checkout: stable/yoga
+
+- job:
name: octavia-v2-act-stdby-dsvm-scenario-stable-xena
parent: octavia-v2-act-stdby-dsvm-scenario
override-checkout: stable/xena
@@ -988,12 +995,6 @@
parent: octavia-v2-act-stdby-dsvm-scenario
override-checkout: stable/victoria
-- job:
- name: octavia-v2-act-stdby-dsvm-scenario-stable-ussuri
- parent: octavia-v2-act-stdby-dsvm-scenario
- nodeset: octavia-single-node-ubuntu-bionic
- override-checkout: stable/ussuri
-
######### Third party jobs ##########
- job:
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 49ba09d..9e4b890 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -9,21 +9,21 @@
check:
jobs:
- octavia-v2-dsvm-noop-api
+ - octavia-v2-dsvm-noop-api-stable-yoga
- octavia-v2-dsvm-noop-api-stable-xena
- octavia-v2-dsvm-noop-api-stable-wallaby
- octavia-v2-dsvm-noop-api-stable-victoria
- - octavia-v2-dsvm-noop-api-stable-ussuri
- octavia-v2-dsvm-noop-api-scoped-tokens
- octavia-v2-dsvm-scenario
+ - octavia-v2-dsvm-scenario-stable-yoga
- octavia-v2-dsvm-scenario-stable-xena
- octavia-v2-dsvm-scenario-stable-wallaby
- octavia-v2-dsvm-scenario-stable-victoria
- - octavia-v2-dsvm-scenario-stable-ussuri
- octavia-v2-dsvm-tls-barbican
+ - octavia-v2-dsvm-tls-barbican-stable-yoga
- octavia-v2-dsvm-tls-barbican-stable-xena
- octavia-v2-dsvm-tls-barbican-stable-wallaby
- octavia-v2-dsvm-tls-barbican-stable-victoria
- - octavia-v2-dsvm-tls-barbican-stable-ussuri
- octavia-v2-dsvm-scenario-ipv6-only:
voting: false
- octavia-v2-dsvm-scenario-centos-8-stream:
@@ -34,24 +34,24 @@
voting: false
- octavia-v2-act-stdby-dsvm-scenario:
voting: false
+ - octavia-v2-act-stdby-dsvm-scenario-stable-yoga:
+ voting: false
- octavia-v2-act-stdby-dsvm-scenario-stable-xena:
voting: false
- octavia-v2-act-stdby-dsvm-scenario-stable-wallaby:
voting: false
- octavia-v2-act-stdby-dsvm-scenario-stable-victoria:
voting: false
- - octavia-v2-act-stdby-dsvm-scenario-stable-ussuri:
- voting: false
- octavia-v2-dsvm-spare-pool:
voting: false
+ - octavia-v2-dsvm-spare-pool-stable-yoga:
+ voting: false
- octavia-v2-dsvm-spare-pool-stable-xena:
voting: false
- octavia-v2-dsvm-spare-pool-stable-wallaby:
voting: false
- octavia-v2-dsvm-spare-pool-stable-victoria:
voting: false
- - octavia-v2-dsvm-spare-pool-stable-ussuri:
- voting: false
- octavia-v2-dsvm-cinder-amphora:
voting: false
# Third party provider jobs
@@ -64,18 +64,18 @@
queue: octavia
jobs:
- octavia-v2-dsvm-noop-api
+ - octavia-v2-dsvm-noop-api-stable-yoga
- octavia-v2-dsvm-noop-api-stable-xena
- octavia-v2-dsvm-noop-api-stable-wallaby
- octavia-v2-dsvm-noop-api-stable-victoria
- - octavia-v2-dsvm-noop-api-stable-ussuri
- octavia-v2-dsvm-noop-api-scoped-tokens
- octavia-v2-dsvm-scenario
+ - octavia-v2-dsvm-scenario-stable-yoga
- octavia-v2-dsvm-scenario-stable-xena
- octavia-v2-dsvm-scenario-stable-wallaby
- octavia-v2-dsvm-scenario-stable-victoria
- - octavia-v2-dsvm-scenario-stable-ussuri
- octavia-v2-dsvm-tls-barbican
+ - octavia-v2-dsvm-tls-barbican-stable-yoga
- octavia-v2-dsvm-tls-barbican-stable-xena
- octavia-v2-dsvm-tls-barbican-stable-wallaby
- octavia-v2-dsvm-tls-barbican-stable-victoria
- - octavia-v2-dsvm-tls-barbican-stable-ussuri