Merge "Add UDP test scenario"
diff --git a/octavia_tempest_plugin/tests/scenario/v2/test_pool.py b/octavia_tempest_plugin/tests/scenario/v2/test_pool.py
index 7a97b84..31f0178 100644
--- a/octavia_tempest_plugin/tests/scenario/v2/test_pool.py
+++ b/octavia_tempest_plugin/tests/scenario/v2/test_pool.py
@@ -216,3 +216,10 @@
const.PROVISIONING_STATUS,
CONF.load_balancer.check_interval,
CONF.load_balancer.check_timeout)
+
+ waiters.wait_for_status(
+ self.mem_lb_client.show_loadbalancer,
+ self.lb_id, const.PROVISIONING_STATUS,
+ const.ACTIVE,
+ CONF.load_balancer.check_interval,
+ CONF.load_balancer.check_timeout)
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 0ed5532..8462374 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -2,9 +2,9 @@
name: octavia-two-node
nodes:
- name: controller
- label: ubuntu-xenial
+ label: ubuntu-bionic
- name: controller2
- label: ubuntu-xenial
+ label: ubuntu-bionic
groups:
- name: controller
nodes:
@@ -559,6 +559,7 @@
devstack_localrc:
OCTAVIA_AMP_BASE_OS: ubuntu
OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: xenial
+ USE_PYTHON3: false
- job:
name: octavia-v2-dsvm-tls-barbican
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 4445910..be12bba 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -22,8 +22,6 @@
voting: false
- octavia-v2-dsvm-scenario-centos-8:
voting: false
- - octavia-v2-dsvm-scenario-ubuntu-bionic:
- voting: false
- octavia-v2-act-stdby-dsvm-scenario-two-node:
voting: false
- octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-rocky: