From 13f274093e2ef2c7534f2a680786eefdb5982687 Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Mon, 17 Mar 2025 17:18:28 -0400 Subject: [PATCH] Update jobs based on testing runtime for 2025.2 Based on [0] only py310 and py312 jobs are in the testing runtime for 2025.2, updated relevant files accordingly. Added py313 jobs as non-voting. [0] https://review.opendev.org/c/openstack/governance/+/941141 Depends-on: https://review.opendev.org/c/openstack/openstack-zuul-jobs/+/941246 Change-Id: Ie452dab188ad76bf9c4e8b048d88393038d2bf77 --- setup.cfg | 3 ++- zuul.d/job-templates.yaml | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/setup.cfg b/setup.cfg index c1fda4164a3..3eb4ad2ac5a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,6 +6,8 @@ description_file = author = OpenStack author_email = openstack-discuss@lists.openstack.org home_page = https://docs.openstack.org/neutron/latest/ +# NOTE(haleyb) This can move to 3.10 once the FIPS job is changed to run +# on centos-10-stream, moving now will cause a centos-9-stream job failure python_requires = >=3.9 classifier = Environment :: OpenStack @@ -15,7 +17,6 @@ classifier = Operating System :: POSIX :: Linux Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 Programming Language :: Python :: 3.12 diff --git a/zuul.d/job-templates.yaml b/zuul.d/job-templates.yaml index ed3755324e2..1669e0a8061 100644 --- a/zuul.d/job-templates.yaml +++ b/zuul.d/job-templates.yaml @@ -2,7 +2,7 @@ name: neutron-tox-override-jobs check: jobs: - - openstack-tox-py39: # from openstack-python3-jobs template + - openstack-tox-py310: # from openstack-python3-jobs template timeout: 3600 irrelevant-files: &irrelevant-files - ^\.pre-commit-config\.yaml$ @@ -33,6 +33,9 @@ - openstack-tox-py312: # from openstack-python3-jobs template timeout: 3600 irrelevant-files: *irrelevant-files + - openstack-tox-py313: # from openstack-python3-jobs template + timeout: 3600 + irrelevant-files: *irrelevant-files - openstack-tox-cover: # from openstack-cover-jobs template timeout: 4800 pre-run: playbooks/configure_swap.yaml @@ -41,15 +44,18 @@ irrelevant-files: *irrelevant-files check-arm64: jobs: - - openstack-tox-py39-arm64: # from openstack-python3-jobs-arm64 template + - openstack-tox-py310-arm64: # from openstack-python3-jobs-arm64 template timeout: 4800 irrelevant-files: *irrelevant-files - openstack-tox-py312-arm64: # from openstack-python3-jobs-arm64 template timeout: 4800 irrelevant-files: *irrelevant-files + - openstack-tox-py313-arm64: # from openstack-python3-jobs-arm64 template + timeout: 4800 + irrelevant-files: *irrelevant-files gate: jobs: - - openstack-tox-py39: # from openstack-python3-jobs template + - openstack-tox-py310: # from openstack-python3-jobs template timeout: 3600 irrelevant-files: *irrelevant-files - openstack-tox-py312: # from openstack-python3-jobs template @@ -57,10 +63,7 @@ irrelevant-files: *irrelevant-files periodic: jobs: - - openstack-tox-py39: # from openstack-python3-jobs template - timeout: 3600 - irrelevant-files: *irrelevant-files - - openstack-tox-py312: # from openstack-python3-jobs template + - openstack-tox-py311: # from openstack-python3-jobs template timeout: 3600 irrelevant-files: *irrelevant-files @@ -120,7 +123,7 @@ - openstacksdk-functional-devstack-networking - neutron-ovs-tempest-plugin-iptables_hybrid-nftables - devstack-enforce-scope - - openstack-tox-py39-with-oslo-master: + - openstack-tox-py312-with-oslo-master: timeout: 3600 irrelevant-files: *irrelevant-files - openstack-tox-py312-with-sqlalchemy-master: