summaryrefslogtreecommitdiff
path: root/zuul.d
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-02-20 12:37:49 +0000
committerGerrit Code Review <review@openstack.org>2023-02-20 12:37:49 +0000
commit2e1616ca97e16df8f29f717e2685fe46a3d6a9b0 (patch)
tree4f086cb9e2563a1d9d5372b17534ce14200b52c0 /zuul.d
parentf991fc2fbef6b69b97d373e7acff8038b2da3028 (diff)
parent51d449babf88f1b3824e02c34afe0db3971d26f0 (diff)
downloadneutron-2e1616ca97e16df8f29f717e2685fe46a3d6a9b0.tar.gz
Merge "Move tox-py311 job override into job-templates.yaml"
Diffstat (limited to 'zuul.d')
-rw-r--r--zuul.d/job-templates.yaml6
-rw-r--r--zuul.d/project.yaml5
2 files changed, 6 insertions, 5 deletions
diff --git a/zuul.d/job-templates.yaml b/zuul.d/job-templates.yaml
index b8949a289d..70b2501902 100644
--- 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
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 3a384b679a..ba9f2f9a10 100644
--- 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