Merge "Drop unnecessary 'x' bit from doc config file"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index cb40790..b586854 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -515,7 +515,10 @@
- ^doc/.*$
- ^etc/.*$
- ^releasenotes/.*$
- - ^octavia_tempest_plugin/tests/(?!api/|\w+\.py).*
+ - ^octavia_tempest_plugin/tests/act_stdby_scenario/.*
+ - ^octavia_tempest_plugin/tests/barbican_scenario/.*
+ - ^octavia_tempest_plugin/tests/scenario/.*
+ - ^octavia_tempest_plugin/tests/spare_pool_scenario/.* # TODO: remove
- job:
name: octavia-v2-dsvm-noop-api-keystone-default-roles
@@ -544,6 +547,12 @@
USE_PYTHON3: False
- job:
+ name: octavia-v2-dsvm-noop-api-stable-2024-2
+ parent: octavia-v2-dsvm-noop-api
+ nodeset: octavia-single-node-ubuntu-jammy
+ override-checkout: stable/2024.2
+
+- job:
name: octavia-v2-dsvm-noop-api-stable-2024-1
parent: octavia-v2-dsvm-noop-api
nodeset: octavia-single-node-ubuntu-jammy
@@ -583,7 +592,10 @@
- ^doc/.*$
- ^etc/.*$
- ^releasenotes/.*$
- - ^octavia_tempest_plugin/tests/(?!scenario/|\w+\.py).*
+ - ^octavia_tempest_plugin/tests/act_stdby_scenario/.*
+ - ^octavia_tempest_plugin/tests/api/.*
+ - ^octavia_tempest_plugin/tests/barbican_scenario/.*
+ - ^octavia_tempest_plugin/tests/spare_pool_scenario/.* # TODO: remove
- job:
name: octavia-v2-dsvm-scenario
@@ -623,7 +635,10 @@
- ^doc/.*$
- ^etc/.*$
- ^releasenotes/.*$
- - ^octavia_tempest_plugin/tests/(?!scenario/|\w+\.py).*
+ - ^octavia_tempest_plugin/tests/act_stdby_scenario/.*
+ - ^octavia_tempest_plugin/tests/api/.*
+ - ^octavia_tempest_plugin/tests/barbican_scenario/.*
+ - ^octavia_tempest_plugin/tests/spare_pool_scenario/.* # TODO: remove
- job:
name: octavia-v2-dsvm-py2-scenario
@@ -636,6 +651,24 @@
override-checkout: 2.30.0
- job:
+ name: octavia-v2-dsvm-scenario-stable-2024-2
+ parent: octavia-v2-dsvm-scenario
+ nodeset: octavia-single-node-ubuntu-jammy
+ override-checkout: stable/2024.2
+
+- job:
+ name: octavia-v2-dsvm-scenario-traffic-ops-stable-2024-2
+ parent: octavia-v2-dsvm-scenario-stable-2024-2
+ vars:
+ tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops
+
+- job:
+ name: octavia-v2-dsvm-scenario-non-traffic-ops-stable-2024-2
+ parent: octavia-v2-dsvm-scenario-stable-2024-2
+ vars:
+ tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.(?!.*traffic_ops)
+
+- job:
name: octavia-v2-dsvm-scenario-stable-2024-1
parent: octavia-v2-dsvm-scenario
nodeset: octavia-single-node-ubuntu-jammy
@@ -703,7 +736,10 @@
- ^doc/.*$
- ^etc/.*$
- ^releasenotes/.*$
- - ^octavia_tempest_plugin/tests/(?!scenario/|\w+\.py).*
+ - ^octavia_tempest_plugin/tests/act_stdby_scenario/.*
+ - ^octavia_tempest_plugin/tests/api/.*
+ - ^octavia_tempest_plugin/tests/barbican_scenario/.*
+ - ^octavia_tempest_plugin/tests/spare_pool_scenario/.* # TODO: remove
- job:
name: octavia-v2-dsvm-py2-scenario-two-node
@@ -863,7 +899,10 @@
- ^doc/.*$
- ^etc/.*$
- ^releasenotes/.*$
- - ^octavia_tempest_plugin/tests/(?!barbican_scenario/|\w+\.py).*
+ - ^octavia_tempest_plugin/tests/act_stdby_scenario/.*
+ - ^octavia_tempest_plugin/tests/api/.*
+ - ^octavia_tempest_plugin/tests/scenario/.*
+ - ^octavia_tempest_plugin/tests/spare_pool_scenario/.* # TODO: remove
- job:
name: octavia-v2-dsvm-tls-barbican
@@ -874,10 +913,10 @@
nodeset: octavia-single-node-ubuntu-jammy
- job:
- name: octavia-v2-dsvm-tls-barbican-stable-2024-1
+ name: octavia-v2-dsvm-tls-barbican-stable-2024-2
parent: octavia-v2-dsvm-tls-barbican
nodeset: octavia-single-node-ubuntu-jammy
- override-checkout: stable/2024.1
+ override-checkout: stable/2024.2
- job:
name: octavia-v2-dsvm-tls-barbican-stable-2024-1
@@ -1039,10 +1078,10 @@
nodeset: octavia-single-node-ubuntu-jammy
- job:
- name: octavia-v2-act-stdby-dsvm-scenario-stable-2024-1
+ name: octavia-v2-act-stdby-dsvm-scenario-stable-2024-2
parent: octavia-v2-act-stdby-dsvm-scenario
nodeset: octavia-single-node-ubuntu-jammy
- override-checkout: stable/2024.1
+ override-checkout: stable/2024.2
- job:
name: octavia-v2-act-stdby-dsvm-scenario-stable-2024-1
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index f47fae7..4d64f18 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -9,12 +9,15 @@
check:
jobs:
- octavia-v2-dsvm-noop-api
+ - octavia-v2-dsvm-noop-api-stable-2024-2
- octavia-v2-dsvm-noop-api-stable-2024-1
- octavia-v2-dsvm-noop-api-stable-2023-2
- octavia-v2-dsvm-noop-api-stable-2023-1
- octavia-v2-dsvm-noop-api-keystone-default-roles
- octavia-v2-dsvm-scenario-traffic-ops
- octavia-v2-dsvm-scenario-non-traffic-ops
+ - octavia-v2-dsvm-scenario-traffic-ops-stable-2024-2
+ - octavia-v2-dsvm-scenario-non-traffic-ops-stable-2024-2
- octavia-v2-dsvm-scenario-traffic-ops-stable-2024-1
- octavia-v2-dsvm-scenario-non-traffic-ops-stable-2024-1
- octavia-v2-dsvm-scenario-traffic-ops-stable-2023-2
@@ -22,6 +25,7 @@
- octavia-v2-dsvm-scenario-traffic-ops-stable-2023-1
- octavia-v2-dsvm-scenario-non-traffic-ops-stable-2023-1
- octavia-v2-dsvm-tls-barbican
+ - octavia-v2-dsvm-tls-barbican-stable-2024-2
- octavia-v2-dsvm-tls-barbican-stable-2024-1
- octavia-v2-dsvm-tls-barbican-stable-2023-2
- octavia-v2-dsvm-tls-barbican-stable-2023-1
@@ -39,6 +43,8 @@
voting: false
- octavia-v2-act-stdby-dsvm-scenario:
voting: false
+ - octavia-v2-act-stdby-dsvm-scenario-stable-2024-2:
+ voting: false
- octavia-v2-act-stdby-dsvm-scenario-stable-2024-1:
voting: false
- octavia-v2-act-stdby-dsvm-scenario-stable-2023-2:
@@ -57,12 +63,15 @@
fail-fast: true
jobs:
- octavia-v2-dsvm-noop-api
+ - octavia-v2-dsvm-noop-api-stable-2024-2
- octavia-v2-dsvm-noop-api-stable-2024-1
- octavia-v2-dsvm-noop-api-stable-2023-2
- octavia-v2-dsvm-noop-api-stable-2023-1
- octavia-v2-dsvm-noop-api-keystone-default-roles
- octavia-v2-dsvm-scenario-traffic-ops
- octavia-v2-dsvm-scenario-non-traffic-ops
+ - octavia-v2-dsvm-scenario-traffic-ops-stable-2024-2
+ - octavia-v2-dsvm-scenario-non-traffic-ops-stable-2024-2
- octavia-v2-dsvm-scenario-traffic-ops-stable-2024-1
- octavia-v2-dsvm-scenario-non-traffic-ops-stable-2024-1
- octavia-v2-dsvm-scenario-traffic-ops-stable-2023-2
@@ -70,6 +79,7 @@
- octavia-v2-dsvm-scenario-traffic-ops-stable-2023-1
- octavia-v2-dsvm-scenario-non-traffic-ops-stable-2023-1
- octavia-v2-dsvm-tls-barbican
+ - octavia-v2-dsvm-tls-barbican-stable-2024-2
- octavia-v2-dsvm-tls-barbican-stable-2024-1
- octavia-v2-dsvm-tls-barbican-stable-2023-2
- octavia-v2-dsvm-tls-barbican-stable-2023-1