Merge "Stop running 2023.1 (Antelope) jobs in check/gate"
diff --git a/zuul.d/2023_1_jobs.yaml b/zuul.d/2023_1_jobs.yaml
index 32e2c4c..f038076 100644
--- a/zuul.d/2023_1_jobs.yaml
+++ b/zuul.d/2023_1_jobs.yaml
@@ -212,6 +212,7 @@
(^tempest.api.compute.servers.test_multiple_create)"
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_ovn) | join(',') }}"
+ NEUTRON_DEPLOY_MOD_WSGI: false
devstack_services:
q-ovn-metadata-agent: true
q-ovn-agent: false
@@ -244,6 +245,8 @@
override-checkout: stable/2023.1
vars:
network_api_extensions_common: *api_extensions
+ devstack_localrc:
+ NEUTRON_DEPLOY_MOD_WSGI: false
- job:
name: neutron-tempest-plugin-sfc-2023-1
diff --git a/zuul.d/2023_2_jobs.yaml b/zuul.d/2023_2_jobs.yaml
index 7aa1642..63a63fa 100644
--- a/zuul.d/2023_2_jobs.yaml
+++ b/zuul.d/2023_2_jobs.yaml
@@ -207,6 +207,7 @@
(^tempest.api.compute.servers.test_multiple_create)"
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_ovn) | join(',') }}"
+ NEUTRON_DEPLOY_MOD_WSGI: false
devstack_services:
q-ovn-metadata-agent: true
q-ovn-agent: false
@@ -239,6 +240,8 @@
override-checkout: stable/2023.2
vars:
network_api_extensions_common: *api_extensions
+ devstack_localrc:
+ NEUTRON_DEPLOY_MOD_WSGI: false
- job:
name: neutron-tempest-plugin-sfc-2023-2
diff --git a/zuul.d/2024_1_jobs.yaml b/zuul.d/2024_1_jobs.yaml
index 86fbc52..c426be6 100644
--- a/zuul.d/2024_1_jobs.yaml
+++ b/zuul.d/2024_1_jobs.yaml
@@ -209,6 +209,7 @@
(^tempest.api.compute.servers.test_multiple_create)"
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_ovn) | join(',') }}"
+ NEUTRON_DEPLOY_MOD_WSGI: false
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
@@ -238,6 +239,8 @@
override-checkout: stable/2024.1
vars:
network_api_extensions_common: *api_extensions
+ devstack_localrc:
+ NEUTRON_DEPLOY_MOD_WSGI: false
- job:
name: neutron-tempest-plugin-sfc-2024-1
diff --git a/zuul.d/2024_2_jobs.yaml b/zuul.d/2024_2_jobs.yaml
index 61d0351..bb77ca2 100644
--- a/zuul.d/2024_2_jobs.yaml
+++ b/zuul.d/2024_2_jobs.yaml
@@ -212,6 +212,7 @@
(^neutron_tempest_plugin.scenario.test_mtu.NetworkWritableMtuTest)"
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_ovn) | join(',') }}"
+ NEUTRON_DEPLOY_MOD_WSGI: false
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
@@ -240,6 +241,8 @@
override-checkout: stable/2024.2
vars:
network_api_extensions_common: *api_extensions
+ devstack_localrc:
+ NEUTRON_DEPLOY_MOD_WSGI: false
- job:
name: neutron-tempest-plugin-sfc-2024-2
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 5518798..4ebbd0c 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -218,6 +218,7 @@
- ^zuul.d/2023_1_jobs.yaml
- ^zuul.d/2023_2_jobs.yaml
- ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/2024_2_jobs.yaml
- ^zuul.d/base-nested-switch.yaml
- ^zuul.d/master_jobs.yaml
- ^zuul.d/victoria_jobs.yaml
@@ -326,6 +327,7 @@
- ^zuul.d/2023_1_jobs.yaml
- ^zuul.d/2023_2_jobs.yaml
- ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/2024_2_jobs.yaml
- ^zuul.d/base-nested-switch.yaml
- ^zuul.d/master_jobs.yaml
- ^zuul.d/victoria_jobs.yaml
@@ -443,6 +445,7 @@
- ^zuul.d/2023_1_jobs.yaml
- ^zuul.d/2023_2_jobs.yaml
- ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/2024_2_jobs.yaml
- ^zuul.d/base-nested-switch.yaml
- ^zuul.d/master_jobs.yaml
- ^zuul.d/victoria_jobs.yaml
@@ -457,6 +460,7 @@
vars:
devstack_localrc:
NEUTRON_ENFORCE_SCOPE: false
+ NEUTRON_DEPLOY_MOD_WSGI: true
- job:
name: neutron-tempest-plugin-openvswitch-distributed-dhcp
@@ -610,6 +614,7 @@
- ^zuul.d/2023_1_jobs.yaml
- ^zuul.d/2023_2_jobs.yaml
- ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/2024_2_jobs.yaml
- ^zuul.d/base-nested-switch.yaml
- ^zuul.d/master_jobs.yaml
- ^zuul.d/victoria_jobs.yaml
@@ -640,6 +645,7 @@
OVN_DBS_LOG_LEVEL: dbg
ENABLE_TLS: True
OVN_IGMP_SNOOPING_ENABLE: True
+ NEUTRON_DEPLOY_MOD_WSGI: true
devstack_services:
br-ex-tcpdump: true
br-int-flows: true
@@ -746,6 +752,7 @@
- ^zuul.d/2023_1_jobs.yaml
- ^zuul.d/2023_2_jobs.yaml
- ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/2024_2_jobs.yaml
- ^zuul.d/base-nested-switch.yaml
- ^zuul.d/master_jobs.yaml
- ^zuul.d/victoria_jobs.yaml
@@ -1004,6 +1011,7 @@
- ^zuul.d/2023_1_jobs.yaml
- ^zuul.d/2023_2_jobs.yaml
- ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/2024_2_jobs.yaml
- ^zuul.d/base-nested-switch.yaml
- ^zuul.d/master_jobs.yaml
- ^zuul.d/victoria_jobs.yaml
@@ -1029,6 +1037,7 @@
# empty
ADVANCED_IMAGE_NAME: ""
NETWORK_API_EXTENSIONS: "{{ network_api_extensions_common | join(',') }}"
+ NEUTRON_DEPLOY_MOD_WSGI: true
devstack_plugins:
designate: https://opendev.org/openstack/designate.git
devstack_services:
@@ -1097,6 +1106,7 @@
- ^zuul.d/2023_1_jobs.yaml
- ^zuul.d/2023_2_jobs.yaml
- ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/2024_2_jobs.yaml
- ^zuul.d/base-nested-switch.yaml
- ^zuul.d/master_jobs.yaml
- ^zuul.d/victoria_jobs.yaml
@@ -1184,6 +1194,7 @@
- ^zuul.d/2023_1_jobs.yaml
- ^zuul.d/2023_2_jobs.yaml
- ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/2024_2_jobs.yaml
- ^zuul.d/base-nested-switch.yaml
- ^zuul.d/master_jobs.yaml
- ^zuul.d/victoria_jobs.yaml
@@ -1263,6 +1274,7 @@
- ^zuul.d/2023_1_jobs.yaml
- ^zuul.d/2023_2_jobs.yaml
- ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/2024_2_jobs.yaml
- ^zuul.d/base-nested-switch.yaml
- ^zuul.d/master_jobs.yaml
- ^zuul.d/victoria_jobs.yaml
@@ -1327,6 +1339,7 @@
- ^zuul.d/2023_1_jobs.yaml
- ^zuul.d/2023_2_jobs.yaml
- ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/2024_2_jobs.yaml
- ^zuul.d/base-nested-switch.yaml
- ^zuul.d/master_jobs.yaml
- ^zuul.d/victoria_jobs.yaml
@@ -1403,6 +1416,7 @@
- ^zuul.d/2023_1_jobs.yaml
- ^zuul.d/2023_2_jobs.yaml
- ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/2024_2_jobs.yaml
- ^zuul.d/base-nested-switch.yaml
- ^zuul.d/master_jobs.yaml
- ^zuul.d/victoria_jobs.yaml
@@ -1483,6 +1497,7 @@
- ^zuul.d/2023_1_jobs.yaml
- ^zuul.d/2023_2_jobs.yaml
- ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/2024_2_jobs.yaml
- ^zuul.d/base-nested-switch.yaml
- ^zuul.d/master_jobs.yaml
- ^zuul.d/victoria_jobs.yaml
@@ -1553,6 +1568,7 @@
- ^zuul.d/2023_1_jobs.yaml
- ^zuul.d/2023_2_jobs.yaml
- ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/2024_2_jobs.yaml
- ^zuul.d/base-nested-switch.yaml
- ^zuul.d/master_jobs.yaml
- ^zuul.d/victoria_jobs.yaml
@@ -1673,6 +1689,7 @@
- ^zuul.d/2023_1_jobs.yaml
- ^zuul.d/2023_2_jobs.yaml
- ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/2024_2_jobs.yaml
- ^zuul.d/base-nested-switch.yaml
- ^zuul.d/master_jobs.yaml
- ^zuul.d/victoria_jobs.yaml
diff --git a/zuul.d/victoria_jobs.yaml b/zuul.d/victoria_jobs.yaml
index b208ab5..817e759 100644
--- a/zuul.d/victoria_jobs.yaml
+++ b/zuul.d/victoria_jobs.yaml
@@ -244,6 +244,7 @@
CUSTOMIZE_IMAGE: false
OVN_BRANCH: "v21.06.0"
OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
+ NEUTRON_DEPLOY_MOD_WSGI: false
devstack_services:
q-ovn-metadata-agent: true
q-ovn-agent: false
diff --git a/zuul.d/wallaby_jobs.yaml b/zuul.d/wallaby_jobs.yaml
index ea64224..56ed2cf 100644
--- a/zuul.d/wallaby_jobs.yaml
+++ b/zuul.d/wallaby_jobs.yaml
@@ -181,6 +181,7 @@
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
OVN_BRANCH: "v21.06.0"
OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
+ NEUTRON_DEPLOY_MOD_WSGI: false
devstack_services:
q-ovn-metadata-agent: true
q-ovn-agent: false
@@ -214,6 +215,8 @@
override-checkout: 0.16.0
vars:
network_api_extensions_common: *api_extensions
+ devstack_localrc:
+ NEUTRON_DEPLOY_MOD_WSGI: false
- job:
name: neutron-tempest-plugin-sfc-wallaby
diff --git a/zuul.d/xena_jobs.yaml b/zuul.d/xena_jobs.yaml
index 4d35497..c39db75 100644
--- a/zuul.d/xena_jobs.yaml
+++ b/zuul.d/xena_jobs.yaml
@@ -175,6 +175,7 @@
network_api_extensions: *api_extensions
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
+ NEUTRON_DEPLOY_MOD_WSGI: false
devstack_services:
q-ovn-metadata-agent: true
q-ovn-agent: false
@@ -202,6 +203,8 @@
required-projects: *required-projects-xena
vars:
network_api_extensions_common: *api_extensions
+ devstack_localrc:
+ NEUTRON_DEPLOY_MOD_WSGI: false
- job:
name: neutron-tempest-plugin-sfc-xena
diff --git a/zuul.d/yoga_jobs.yaml b/zuul.d/yoga_jobs.yaml
index 04bbc31..387e397 100644
--- a/zuul.d/yoga_jobs.yaml
+++ b/zuul.d/yoga_jobs.yaml
@@ -189,6 +189,7 @@
- vlan-transparent
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions + network_api_extensions_ovn) | join(',') }}"
+ NEUTRON_DEPLOY_MOD_WSGI: false
devstack_services:
q-ovn-metadata-agent: true
q-ovn-agent: false
@@ -217,6 +218,8 @@
nodeset: neutron-nested-virt-ubuntu-focal
vars:
network_api_extensions_common: *api_extensions
+ devstack_localrc:
+ NEUTRON_DEPLOY_MOD_WSGI: false
- job:
name: neutron-tempest-plugin-sfc-yoga
diff --git a/zuul.d/zed_jobs.yaml b/zuul.d/zed_jobs.yaml
index e2bdb50..70ab40a 100644
--- a/zuul.d/zed_jobs.yaml
+++ b/zuul.d/zed_jobs.yaml
@@ -199,6 +199,7 @@
- vlan-transparent
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions + network_api_extensions_ovn) | join(',') }}"
+ NEUTRON_DEPLOY_MOD_WSGI: false
devstack_services:
q-ovn-metadata-agent: true
q-ovn-agent: false
@@ -227,6 +228,8 @@
nodeset: neutron-nested-virt-ubuntu-focal
vars:
network_api_extensions_common: *api_extensions
+ devstack_localrc:
+ NEUTRON_DEPLOY_MOD_WSGI: false
- job:
name: neutron-tempest-plugin-sfc-zed