From 52e302f0a32a9059b2aeb1fcd22dffe940586fa8 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Thu, 10 Mar 2022 20:07:44 +0530 Subject: [PATCH] Use python3-devel in bindep for rpm distros python36-devel is not available in rpm distro's like CentOS9-Stream or Fedora35. Let's use python3-devel instead which is provided in all these distro's instead of maintaining versioned specific like:- - python36-devel fo CentOS8-Stream - python3.9-devel for CentOS9-Stream - python3.10-devel for Fedora35 Also add openstack-tox-py310 override to tox-override template as that was not added with [1]. [1] https://review.opendev.org/c/openstack/neutron/+/833047 Change-Id: I238e6b7f87d3e007d474dfffa515f7d9a348246b --- bindep.txt | 2 +- zuul.d/job-templates.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bindep.txt b/bindep.txt index 4aa31f23856..a8bd811d10a 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,7 +1,7 @@ # This file contains runtime (non-python) dependencies # More info at: http://docs.openstack.org/infra/bindep/readme.html -python36-devel [platform:rpm] +python3-devel [platform:rpm] # tools/misc-sanity-checks.sh validates .po[t] files gettext [test] diff --git a/zuul.d/job-templates.yaml b/zuul.d/job-templates.yaml index 0e3e209cda5..f361f498cf5 100644 --- a/zuul.d/job-templates.yaml +++ b/zuul.d/job-templates.yaml @@ -23,6 +23,9 @@ - openstack-tox-py39: # from openstack-python3-zed-jobs template timeout: 3600 irrelevant-files: *irrelevant-files + - openstack-tox-py310: # from openstack-python3-zed-jobs template + timeout: 3600 + irrelevant-files: *irrelevant-files - openstack-tox-lower-constraints: # from openstack-tox-lower-constraints template timeout: 3600 irrelevant-files: *irrelevant-files