Merge "Add 2025.1 (Epoxy) stable jobs"
diff --git a/zuul.d/2023_1_jobs.yaml b/zuul.d/2023_1_jobs.yaml
index 83d9dcb..8b6a581 100644
--- a/zuul.d/2023_1_jobs.yaml
+++ b/zuul.d/2023_1_jobs.yaml
@@ -282,6 +282,12 @@
vars:
devstack_localrc:
NEUTRON_DEPLOY_MOD_WSGI: false
+ # NOTE(haleyb): Scenario tests are disabled since they are failing trying
+ # to create the unmaintained/2023.1 branch due to an os-ken issue. See
+ # https://review.opendev.org/c/openstack/neutron-dynamic-routing/+/935090
+ # for more details.
+ tempest_exclude_regex: "\
+ (^neutron_tempest_plugin.neutron_dynamic_routing.scenario)"
- job:
name: neutron-tempest-plugin-fwaas-2023-1
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index b2c79a1..e28d5fa 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -1721,3 +1721,6 @@
name: neutron-tempest-plugin-ovn-ubuntu-jammy
parent: neutron-tempest-plugin-ovn
nodeset: neutron-nested-virt-ubuntu-jammy
+ vars:
+ # NOTE(ykarel) exclude QinqTest due to https://bugs.launchpad.net/neutron/+bug/2101857
+ tempest_exclude_regex: "^neutron_tempest_plugin.scenario.test_vlan_transparency.VlanQinqTest.*"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 53ecb48..07af912 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -5,12 +5,8 @@
- neutron-tempest-plugin-openvswitch
- neutron-tempest-plugin-ovn
- neutron-tempest-plugin-designate-scenario
- - neutron-tempest-plugin-openvswitch-ubuntu-jammy:
- # TODO(ralonsoh): LP#2101857
- voting: false
- - neutron-tempest-plugin-ovn-ubuntu-jammy:
- # TODO(ralonsoh): LP#2101857
- voting: false
+ - neutron-tempest-plugin-openvswitch-ubuntu-jammy
+ - neutron-tempest-plugin-ovn-ubuntu-jammy
gate:
jobs:
- neutron-tempest-plugin-openvswitch