Merge "Fix two-node jobs"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 02b209f..40f0069 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -601,7 +601,7 @@
api_settings:
api_v1_enabled: False
tempest_concurrency: 2
- tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2
+ tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops
tox_envlist: all
irrelevant-files:
- ^.*\.rst$
@@ -955,6 +955,7 @@
$OCTAVIA_CONF:
controller_worker:
volume_driver: volume_cinder_driver
+ loadbalancer_topology: ACTIVE_STANDBY
cinder:
volume_size: 2
devstack_services:
@@ -974,6 +975,7 @@
s-object: false
s-proxy: false
tempest: true
+ tempest_test_regex: ^octavia_tempest_plugin.tests.act_stdby_scenario.v2.test_active_standby\.
# Temporary transitional aliases for gates used in other repos
# Remove once octavia has transitioned job names