Merge "Negative test: set quota lower than resource count"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 35a3e7f..04f5f79 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -177,7 +177,6 @@
templates:
- build-openstack-docs-pti
- neutron-tempest-plugin-jobs
- - neutron-tempest-plugin-jobs-zed
- neutron-tempest-plugin-jobs-2023-1
- neutron-tempest-plugin-jobs-2023-2
- neutron-tempest-plugin-jobs-2024-1
@@ -187,33 +186,27 @@
check:
jobs:
- neutron-tempest-plugin-sfc
- - neutron-tempest-plugin-sfc-zed
- neutron-tempest-plugin-sfc-2023-1
- neutron-tempest-plugin-sfc-2023-2
- neutron-tempest-plugin-sfc-2024-1
- neutron-tempest-plugin-bgpvpn-bagpipe
- - neutron-tempest-plugin-bgpvpn-bagpipe-zed
- neutron-tempest-plugin-bgpvpn-bagpipe-2023-1
- neutron-tempest-plugin-bgpvpn-bagpipe-2023-2
- neutron-tempest-plugin-bgpvpn-bagpipe-2024-1
- neutron-tempest-plugin-dynamic-routing
- - neutron-tempest-plugin-dynamic-routing-zed
- neutron-tempest-plugin-dynamic-routing-2023-1
- neutron-tempest-plugin-dynamic-routing-2023-2
- neutron-tempest-plugin-dynamic-routing-2024-1
- neutron-tempest-plugin-fwaas
- - neutron-tempest-plugin-fwaas-zed
- neutron-tempest-plugin-fwaas-2023-1
- neutron-tempest-plugin-fwaas-2023-2
- neutron-tempest-plugin-fwaas-2024-1
- neutron-tempest-plugin-vpnaas
- neutron-tempest-plugin-vpnaas-ovn
- - neutron-tempest-plugin-vpnaas-zed
- neutron-tempest-plugin-vpnaas-2023-1
- neutron-tempest-plugin-vpnaas-2023-2
- neutron-tempest-plugin-vpnaas-2024-1
- neutron-tempest-plugin-tap-as-a-service
- - neutron-tempest-plugin-tap-as-a-service-zed
- neutron-tempest-plugin-tap-as-a-service-2023-1
- neutron-tempest-plugin-tap-as-a-service-2023-2
- neutron-tempest-plugin-tap-as-a-service-2024-1
diff --git a/zuul.d/wallaby_jobs.yaml b/zuul.d/wallaby_jobs.yaml
index 8a771b8..48b56b2 100644
--- a/zuul.d/wallaby_jobs.yaml
+++ b/zuul.d/wallaby_jobs.yaml
@@ -2,7 +2,7 @@
name: neutron-tempest-plugin-api-wallaby
parent: neutron-tempest-plugin-base
nodeset: openstack-single-node-focal
- override-checkout: stable/wallaby
+ override-checkout: unmaintained/wallaby
required-projects: &required-projects-wallaby
- openstack/neutron
- name: openstack/neutron-tempest-plugin
@@ -98,7 +98,7 @@
- job:
name: neutron-tempest-plugin-scenario-openvswitch-wallaby
parent: neutron-tempest-plugin-openvswitch
- override-checkout: stable/wallaby
+ override-checkout: unmaintained/wallaby
required-projects: *required-projects-wallaby
vars:
tempest_test_regex: "\
@@ -118,7 +118,7 @@
- job:
name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-wallaby
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
- override-checkout: stable/wallaby
+ override-checkout: unmaintained/wallaby
required-projects: *required-projects-wallaby
vars:
tempest_test_regex: "\
@@ -145,7 +145,7 @@
- job:
name: neutron-tempest-plugin-scenario-linuxbridge-wallaby
parent: neutron-tempest-plugin-linuxbridge
- override-checkout: stable/wallaby
+ override-checkout: unmaintained/wallaby
required-projects: *required-projects-wallaby
vars:
tempest_test_regex: "\
@@ -165,7 +165,7 @@
- job:
name: neutron-tempest-plugin-scenario-ovn-wallaby
parent: neutron-tempest-plugin-ovn
- override-checkout: stable/wallaby
+ override-checkout: unmaintained/wallaby
required-projects: *required-projects-wallaby
vars:
tempest_test_regex: "\
@@ -190,7 +190,7 @@
name: neutron-tempest-plugin-dvr-multinode-scenario-wallaby
parent: neutron-tempest-plugin-dvr-multinode-scenario
nodeset: openstack-two-node-focal
- override-checkout: stable/wallaby
+ override-checkout: unmaintained/wallaby
required-projects: *required-projects-wallaby
vars:
network_api_extensions_common: *api_extensions
@@ -198,7 +198,7 @@
- job:
name: neutron-tempest-plugin-designate-scenario-wallaby
parent: neutron-tempest-plugin-designate-scenario
- override-checkout: stable/wallaby
+ override-checkout: unmaintained/wallaby
required-projects:
- openstack/neutron
- name: openstack/neutron-tempest-plugin
@@ -213,7 +213,7 @@
name: neutron-tempest-plugin-sfc-wallaby
parent: neutron-tempest-plugin-sfc
nodeset: openstack-single-node-focal
- override-checkout: stable/wallaby
+ override-checkout: unmaintained/wallaby
required-projects: *required-projects-wallaby
vars:
network_api_extensions_common: *api_extensions
@@ -222,7 +222,7 @@
name: neutron-tempest-plugin-bgpvpn-bagpipe-wallaby
parent: neutron-tempest-plugin-bgpvpn-bagpipe
nodeset: openstack-single-node-focal
- override-checkout: stable/wallaby
+ override-checkout: unmaintained/wallaby
required-projects: *required-projects-wallaby
vars:
network_api_extensions: *api_extensions
@@ -231,7 +231,7 @@
name: neutron-tempest-plugin-dynamic-routing-wallaby
parent: neutron-tempest-plugin-dynamic-routing
nodeset: openstack-single-node-focal
- override-checkout: stable/wallaby
+ override-checkout: unmaintained/wallaby
required-projects: *required-projects-wallaby
vars:
network_api_extensions_common: *api_extensions
@@ -240,7 +240,7 @@
name: neutron-tempest-plugin-vpnaas-wallaby
parent: neutron-tempest-plugin-vpnaas
nodeset: openstack-single-node-focal
- override-checkout: stable/wallaby
+ override-checkout: unmaintained/wallaby
required-projects: *required-projects-wallaby
vars:
network_api_extensions_common: *api_extensions
diff --git a/zuul.d/xena_jobs.yaml b/zuul.d/xena_jobs.yaml
index 9f8e960..fc0b84f 100644
--- a/zuul.d/xena_jobs.yaml
+++ b/zuul.d/xena_jobs.yaml
@@ -2,7 +2,7 @@
name: neutron-tempest-plugin-api-xena
parent: neutron-tempest-plugin-base
nodeset: openstack-single-node-focal
- override-checkout: stable/xena
+ override-checkout: unmaintained/xena
required-projects: &required-projects-xena
- openstack/neutron
- name: openstack/neutron-tempest-plugin
@@ -100,7 +100,7 @@
- job:
name: neutron-tempest-plugin-scenario-openvswitch-xena
parent: neutron-tempest-plugin-openvswitch
- override-checkout: stable/xena
+ override-checkout: unmaintained/xena
required-projects: *required-projects-xena
vars:
tempest_test_regex: "\
@@ -120,7 +120,7 @@
- job:
name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-xena
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
- override-checkout: stable/xena
+ override-checkout: unmaintained/xena
required-projects: *required-projects-xena
vars:
tempest_test_regex: "\
@@ -140,7 +140,7 @@
- job:
name: neutron-tempest-plugin-scenario-linuxbridge-xena
parent: neutron-tempest-plugin-linuxbridge
- override-checkout: stable/xena
+ override-checkout: unmaintained/xena
required-projects: *required-projects-xena
vars:
tempest_test_regex: "\
@@ -160,7 +160,7 @@
- job:
name: neutron-tempest-plugin-scenario-ovn-xena
parent: neutron-tempest-plugin-ovn
- override-checkout: stable/xena
+ override-checkout: unmaintained/xena
required-projects: *required-projects-xena
vars:
tempest_test_regex: "\
@@ -183,7 +183,7 @@
name: neutron-tempest-plugin-dvr-multinode-scenario-xena
parent: neutron-tempest-plugin-dvr-multinode-scenario
nodeset: openstack-two-node-focal
- override-checkout: stable/xena
+ override-checkout: unmaintained/xena
required-projects: *required-projects-xena
vars:
network_api_extensions_common: *api_extensions
@@ -191,7 +191,7 @@
- job:
name: neutron-tempest-plugin-designate-scenario-xena
parent: neutron-tempest-plugin-designate-scenario
- override-checkout: stable/xena
+ override-checkout: unmaintained/xena
required-projects: *required-projects-xena
vars:
network_api_extensions_common: *api_extensions
@@ -200,7 +200,7 @@
name: neutron-tempest-plugin-sfc-xena
parent: neutron-tempest-plugin-sfc
nodeset: openstack-single-node-focal
- override-checkout: stable/xena
+ override-checkout: unmaintained/xena
required-projects: *required-projects-xena
vars:
network_api_extensions_common: *api_extensions
@@ -209,7 +209,7 @@
name: neutron-tempest-plugin-bgpvpn-bagpipe-xena
parent: neutron-tempest-plugin-bgpvpn-bagpipe
nodeset: openstack-single-node-focal
- override-checkout: stable/xena
+ override-checkout: unmaintained/xena
required-projects: *required-projects-xena
vars:
network_api_extensions: *api_extensions
@@ -218,7 +218,7 @@
name: neutron-tempest-plugin-dynamic-routing-xena
parent: neutron-tempest-plugin-dynamic-routing
nodeset: openstack-single-node-focal
- override-checkout: stable/xena
+ override-checkout: unmaintained/xena
required-projects: *required-projects-xena
vars:
network_api_extensions_common: *api_extensions
@@ -249,7 +249,7 @@
name: neutron-tempest-plugin-vpnaas-xena
parent: neutron-tempest-plugin-vpnaas
nodeset: openstack-single-node-focal
- override-checkout: stable/xena
+ override-checkout: unmaintained/xena
required-projects: *required-projects-xena
vars:
network_api_extensions_common: *api_extensions
@@ -258,7 +258,7 @@
name: neutron-tempest-plugin-tap-as-a-service-xena
parent: neutron-tempest-plugin-tap-as-a-service
nodeset: openstack-single-node-focal
- override-checkout: stable/xena
+ override-checkout: unmaintained/xena
required-projects: *required-projects-xena
vars:
network_api_extensions_common: *api_extensions
diff --git a/zuul.d/yoga_jobs.yaml b/zuul.d/yoga_jobs.yaml
index 76cac3e..af7f97e 100644
--- a/zuul.d/yoga_jobs.yaml
+++ b/zuul.d/yoga_jobs.yaml
@@ -6,9 +6,7 @@
required-projects: &required-projects-yoga
- openstack/neutron
- name: openstack/neutron-tempest-plugin
- # Move to 2.6.0 once released
- # https://review.opendev.org/c/openstack/releases/+/908369
- override-checkout: 2.5.0
+ override-checkout: 2.6.0
- openstack/tempest
vars:
tempest_concurrency: 4