Merge "Move tox-py311 job override into job-templates.yaml"

2023-02-20 12:37:49 +00:00 · 2023-02-20 12:37:49 +00:00 · 2e1616ca97
commit 2e1616ca97
parent f991fc2fbe 51d449babf
2 changed files with 6 additions and 5 deletions
--- a/zuul.d/job-templates.yaml
+++ b/zuul.d/job-templates.yaml
@ -24,6 +24,12 @@
        - openstack-tox-py310: # from openstack-python3-jobs template
            timeout: 3600
            irrelevant-files:  *irrelevant-files
+        # NOTE(ralonsoh): to be updated when "openstack-tox-py311" is defined
+        # and added to "openstack-python3-jobs" template.
+        - tox-py311:
+            voting: false
+            timeout: 3600
+            irrelevant-files:  *irrelevant-files
        - openstack-tox-cover:  # from openstack-cover-jobs template
            timeout: 4800
            irrelevant-files:  *irrelevant-files
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@ -17,11 +17,6 @@
      - neutron-tox-override-jobs
    check:
      jobs:
-        # NOTE(ralonsoh): to be removed when "openstack-tox-py311" is defined
-        # and added to "openstack-python3-jobs" template.
-        - tox-py311:
-            voting: false
-            timeout: 3600
        - neutron-functional-with-uwsgi
        - neutron-fullstack-with-uwsgi
        - neutron-ovs-grenade-multinode