Merge "Remove outdated comments from requirements files"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index ec5c623..273e38a 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -496,13 +496,6 @@
RBAC_test_type: advanced
- job:
- name: octavia-v2-dsvm-noop-py2-api
- parent: octavia-v2-dsvm-noop-api
- vars:
- devstack_localrc:
- USE_PYTHON3: False
-
-- job:
name: octavia-v2-dsvm-noop-api-stable-2025-2
parent: octavia-v2-dsvm-noop-api
nodeset: octavia-single-node-ubuntu-noble
@@ -601,7 +594,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$
@@ -615,16 +608,6 @@
- ^octavia_tempest_plugin/tests/spare_pool_scenario/.* # TODO: remove
- job:
- name: octavia-v2-dsvm-py2-scenario
- parent: octavia-v2-dsvm-scenario
- vars:
- devstack_localrc:
- USE_PYTHON3: False
- required-projects:
- - name: openstack/diskimage-builder
- override-checkout: 2.30.0
-
-- job:
name: octavia-v2-dsvm-scenario-stable-2025-2
parent: octavia-v2-dsvm-scenario
nodeset: octavia-single-node-ubuntu-noble
@@ -728,30 +711,22 @@
- ^octavia_tempest_plugin/tests/spare_pool_scenario/.* # TODO: remove
- job:
- name: octavia-v2-dsvm-py2-scenario-two-node
+ name: octavia-v2-dsvm-scenario-two-node-traffic-ops
parent: octavia-v2-dsvm-scenario-two-node
- host-vars:
- controller:
- devstack_localrc:
- USE_PYTHON3: False
- LIBVIRT_TYPE: kvm
- LIBVIRT_CPU_MODE: host-passthrough
- controller2:
- devstack_localrc:
- USE_PYTHON3: False
- LIBVIRT_TYPE: kvm
- LIBVIRT_CPU_MODE: host-passthrough
- required-projects:
- - name: openstack/diskimage-builder
- override-checkout: 2.30.0
+ vars:
+ tempest_test_regex: "\
+ ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops.*\
+ (test_healthmonitor_|test_.*_ipv6_vip_ipv6_members)"
- job:
- name: octavia-v2-act-stdby-dsvm-scenario-two-node
- parent: octavia-dsvm-live-two-node-base
+ name: octavia-v2-act-stdby-dsvm-scenario-two-node-traffic-ops
+ parent: octavia-v2-dsvm-scenario-two-node
group-vars:
controller:
tempest_concurrency: 2
- tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2
+ tempest_test_regex: "\
+ ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops.*\
+ (test_healthmonitor_|test_.*_ipv6_vip_ipv6_members)"
tox_envlist: all
devstack_local_conf:
post-config:
@@ -937,16 +912,6 @@
spare_pool_enabled: True
- job:
- name: octavia-v2-dsvm-py2-spare-pool
- parent: octavia-v2-dsvm-spare-pool
- vars:
- devstack_localrc:
- USE_PYTHON3: False
- required-projects:
- - name: openstack/diskimage-builder
- override-checkout: 2.30.0
-
-- job:
name: octavia-v2-dsvm-cinder-amphora
parent: octavia-v2-dsvm-scenario
required-projects:
@@ -963,6 +928,7 @@
$OCTAVIA_CONF:
controller_worker:
volume_driver: volume_cinder_driver
+ loadbalancer_topology: ACTIVE_STANDBY
cinder:
volume_size: 2
devstack_services:
@@ -982,16 +948,7 @@
s-object: false
s-proxy: false
tempest: true
-
-# Temporary transitional aliases for gates used in other repos
-# Remove once octavia has transitioned job names
-- job:
- name: octavia-v2-dsvm-noop-py35-api
- parent: octavia-v2-dsvm-noop-api
-
-- job:
- name: octavia-v2-dsvm-py35-scenario
- parent: octavia-v2-dsvm-scenario
+ tempest_test_regex: ^octavia_tempest_plugin.tests.act_stdby_scenario.v2.test_active_standby\.
- job:
name: octavia-v2-act-stdby-iptables-dsvm-scenario
@@ -1021,16 +978,6 @@
- job:
- name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
- parent: octavia-v2-act-stdby-iptables-dsvm-scenario
- vars:
- devstack_localrc:
- USE_PYTHON3: False
- required-projects:
- - name: openstack/diskimage-builder
- override-checkout: 2.30.0
-
-- job:
name: octavia-v2-act-stdby-dsvm-scenario-base
parent: octavia-dsvm-live-base
vars:
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 691c940..2daabdb 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -34,7 +34,7 @@
voting: false
- octavia-v2-dsvm-scenario-rockylinux-9-non-traffic-ops:
voting: false
- - octavia-v2-act-stdby-dsvm-scenario-two-node:
+ - octavia-v2-act-stdby-dsvm-scenario-two-node-traffic-ops:
voting: false
- octavia-v2-act-stdby-dsvm-scenario:
voting: false