Pin neutron-tempest-plugin for stable/wallaby jobs
As stable/wallaby is in EM phase, and currently broken
with the Tempest master. We are pinning tempest there (depends-on).
We are using the tempest 29.0.0 on stable/wallaby (depends-on) and
compatible tag for tempest 29.0.0 is neutron-tempest-plugin 1.8.0
(as neutron-tempest-plugin >= 1.9.0 need tempest>-29.2.0)
- https://github.com/openstack/neutron-tempest-plugin/blob/1.9.0/requirements.txt#L14
- https://zuul.opendev.org/t/openstack/build/f644e4c4c2234ba981c56d91a5b11cbf
As stable/wallaby is in EM phase, we can remove the wallaby job
from master gate.
Depends-On: https://review.opendev.org/c/openstack/devstack/+/871782
Change-Id: Ide5789b40180d572459d47dbd474433644e4dcd7
diff --git a/zuul.d/base-nested-switch.yaml b/zuul.d/base-nested-switch.yaml
index 9689d82..f92b08b 100644
--- a/zuul.d/base-nested-switch.yaml
+++ b/zuul.d/base-nested-switch.yaml
@@ -13,7 +13,7 @@
name: neutron-tempest-plugin-base-nested-switch
parent: neutron-tempest-plugin-base
abstract: true
- branches: ^(?!stable/(queens|rocky|stein|train|ussuri|victoria)).*$
+ branches: ^(?!stable/(queens|rocky|stein|train|ussuri|victoria|wallaby)).*$
# Comment nodeset and vars to switch back to non nested nodes
nodeset: neutron-nested-virt-ubuntu-focal
vars:
@@ -29,4 +29,4 @@
name: neutron-tempest-plugin-base-nested-switch
parent: neutron-tempest-plugin-base
abstract: true
- branches: ^(stable/(queens|rocky|stein|train|ussuri|victoria)).*$
+ branches: ^(stable/(queens|rocky|stein|train|ussuri|victoria|wallaby)).*$
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 6adf860..bb5fe6d 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -216,7 +216,6 @@
templates:
- build-openstack-docs-pti
- neutron-tempest-plugin-jobs
- - neutron-tempest-plugin-jobs-wallaby
- neutron-tempest-plugin-jobs-xena
- neutron-tempest-plugin-jobs-yoga
- neutron-tempest-plugin-jobs-zed
@@ -226,24 +225,20 @@
check:
jobs:
- neutron-tempest-plugin-sfc
- - neutron-tempest-plugin-sfc-wallaby
- neutron-tempest-plugin-sfc-xena
- neutron-tempest-plugin-sfc-yoga
- neutron-tempest-plugin-sfc-zed
- neutron-tempest-plugin-bgpvpn-bagpipe
- - neutron-tempest-plugin-bgpvpn-bagpipe-wallaby
- neutron-tempest-plugin-bgpvpn-bagpipe-xena
- neutron-tempest-plugin-bgpvpn-bagpipe-yoga
- neutron-tempest-plugin-bgpvpn-bagpipe-zed
- neutron-tempest-plugin-dynamic-routing
- - neutron-tempest-plugin-dynamic-routing-wallaby
- neutron-tempest-plugin-dynamic-routing-xena
- neutron-tempest-plugin-dynamic-routing-yoga
- neutron-tempest-plugin-dynamic-routing-zed
- neutron-tempest-plugin-fwaas
- neutron-tempest-plugin-fwaas-zed
- neutron-tempest-plugin-vpnaas
- - neutron-tempest-plugin-vpnaas-wallaby
- neutron-tempest-plugin-vpnaas-xena
- neutron-tempest-plugin-vpnaas-yoga
- neutron-tempest-plugin-vpnaas-zed
diff --git a/zuul.d/wallaby_jobs.yaml b/zuul.d/wallaby_jobs.yaml
index 17a5931..fe93b7e 100644
--- a/zuul.d/wallaby_jobs.yaml
+++ b/zuul.d/wallaby_jobs.yaml
@@ -2,6 +2,11 @@
name: neutron-tempest-plugin-api-wallaby
parent: neutron-tempest-plugin-base
override-checkout: stable/wallaby
+ required-projects: &required-projects-wallaby
+ - openstack/neutron
+ - name: openstack/neutron-tempest-plugin
+ override-checkout: 1.8.0
+ - openstack/tempest
vars:
tempest_concurrency: 4
tempest_test_regex: ^neutron_tempest_plugin\.api
@@ -93,6 +98,7 @@
name: neutron-tempest-plugin-scenario-openvswitch-wallaby
parent: neutron-tempest-plugin-openvswitch
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
tempest_test_regex: "\
(^neutron_tempest_plugin.scenario)|\
@@ -112,6 +118,7 @@
name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-wallaby
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
tempest_test_regex: "\
(^neutron_tempest_plugin.scenario)|\
@@ -131,6 +138,7 @@
name: neutron-tempest-plugin-scenario-linuxbridge-wallaby
parent: neutron-tempest-plugin-linuxbridge
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
tempest_test_regex: "\
(^neutron_tempest_plugin.scenario)|\
@@ -150,6 +158,7 @@
name: neutron-tempest-plugin-scenario-ovn-wallaby
parent: neutron-tempest-plugin-ovn
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
tempest_test_regex: "\
(^neutron_tempest_plugin.scenario)|\
@@ -168,6 +177,7 @@
name: neutron-tempest-plugin-dvr-multinode-scenario-wallaby
parent: neutron-tempest-plugin-dvr-multinode-scenario
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
network_api_extensions_common: *api_extensions
@@ -175,6 +185,13 @@
name: neutron-tempest-plugin-designate-scenario-wallaby
parent: neutron-tempest-plugin-designate-scenario
override-checkout: stable/wallaby
+ required-projects:
+ - openstack/neutron
+ - name: openstack/neutron-tempest-plugin
+ override-checkout: 1.8.0
+ - openstack/tempest
+ - name: openstack/designate-tempest-plugin
+ override-checkout: 0.16.0
vars:
network_api_extensions_common: *api_extensions
@@ -182,6 +199,7 @@
name: neutron-tempest-plugin-sfc-wallaby
parent: neutron-tempest-plugin-sfc
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
network_api_extensions_common: *api_extensions
@@ -189,6 +207,7 @@
name: neutron-tempest-plugin-bgpvpn-bagpipe-wallaby
parent: neutron-tempest-plugin-bgpvpn-bagpipe
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
network_api_extensions: *api_extensions
@@ -196,6 +215,7 @@
name: neutron-tempest-plugin-dynamic-routing-wallaby
parent: neutron-tempest-plugin-dynamic-routing
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
network_api_extensions_common: *api_extensions
@@ -203,5 +223,6 @@
name: neutron-tempest-plugin-vpnaas-wallaby
parent: neutron-tempest-plugin-vpnaas
override-checkout: stable/wallaby
+ required-projects: *required-projects-wallaby
vars:
network_api_extensions_common: *api_extensions