From 9c6df04c78952bb653bac0e7aed15b00d60f2dd7 Mon Sep 17 00:00:00 2001
From: elajkat <lajos.katona@est.tech>
Date: Thu, 28 Sep 2023 09:36:14 +0200
Subject: [PATCH] py311: Add py311 job and sqlalchemy-main job to weekly

As an extra rename dsvm-fullstack to dsvm-fullstack-gate

Change-Id: Ib9627a46f95dec0727ccba1d819b84f6ef00041a
---
 .zuul.yaml | 21 ++++++++++++++++++---
 tox.ini    |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 65a2dc586..9243634d8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,3 +1,15 @@
+- job:
+    name: neutron-fwaas-openstack-tox-py310-with-sqlalchemy-main
+    required-projects:
+      - name: github.com/sqlalchemy/sqlalchemy
+        override-checkout: main
+      - name: github.com/sqlalchemy/alembic
+        override-checkout: main
+      - openstack/oslo.db
+      - openstack/neutron
+      - openstack/neutron-lib
+    parent: openstack-tox-py310-with-oslo-master
+
 - project:
     templates:
       - check-requirements
@@ -26,10 +38,13 @@
     experimental:
       jobs:
         - neutron-fwaas-fullstack
+        - openstack-tox-py310-with-oslo-master
+        - neutron-fwaas-openstack-tox-py310-with-sqlalchemy-main
     periodic-weekly:
       jobs:
-        - openstack-tox-py39
-        - openstack-tox-py39-with-oslo-master
+        - openstack-tox-py311
+        - openstack-tox-py310-with-oslo-master
+        - neutron-fwaas-openstack-tox-py310-with-sqlalchemy-main
         - neutron-fwaas-functional
         - neutron-tempest-plugin-fwaas
 
@@ -62,7 +77,7 @@
       - openstack/tempest
     vars:
       tox_envlist: all
-      tempest_test_regex: ^neutron_tempest_plugin\.fwaas
+      tempest_test_regex: '^(neutron_tempest_plugin.fwaas)'
       devstack_plugins:
         neutron: https://opendev.org/openstack/neutron.git
         neutron-fwaas: https://opendev.org/openstack/neutron-fwaas.git
diff --git a/tox.ini b/tox.ini
index 514962de5..08f3cf3f4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,7 +44,7 @@ setenv = {[testenv]setenv}
 commands =
   stestr run {posargs}
 
-[testenv:dsvm-fullstack]
+[testenv:dsvm-fullstack-gate]
 setenv = {[testenv]setenv}
          {[testenv:common]setenv}
          {[testenv:dsvm]setenv}