openstack
/
tripleo-common
Code Issues Proposed changes

Add support for py39 

Change-Id: I987a3da810613df104402a3acbe3c1c9dcd36ed1
Story: TRIPLEOCI-355
This commit is contained in:
Sorin Sbarnea 2021-03-15 13:06:50 +00:00
parent 3035ec76fb
commit 1ca156439e
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bindep.txt
View File

@ -18,12 +18,14 @@ gcc-c++ [platform:rpm]
git [platform:rpm] git [platform:rpm]
libffi-devel [platform:rpm] libffi-devel [platform:rpm]
openssl-devel [platform:rpm] openssl-devel [platform:rpm]
python-devel [platform:rpm] python-devel [(platform:rpm platform:base-py2)]
python2-dnf [platform:fedora] python2-dnf [(platform:rpm platform:base-py2)]
# For SELinux # For SELinux
libselinux-python [platform:rpm] libselinux-python [(platform:rpm platform:base-py2)]
libsemanage-python [platform:redhat] python3-libselinux [(platform:rpm platform:base-py3)]
libsemanage-python [(platform:rpm platform:base-py2)]
python3-libsemanage-python [(platform:rpm platform:base-py3)]
# Required for compressing collected log files in CI # Required for compressing collected log files in CI
gzip gzip

2
tox.ini
View File

@ -1,6 +1,6 @@
[tox] [tox]
minversion = 3.8 minversion = 3.8
envlist = linters,py38 envlist = linters,py
skipsdist = True skipsdist = True
# Automatic envs will only use the python version appropriate to that # Automatic envs will only use the python version appropriate to that

2
tripleo_common/image/base.py
View File

@ -55,7 +55,7 @@ class BaseImageManager(object):
data = yaml.safe_load(cf.read()).get(section) data = yaml.safe_load(cf.read()).get(section)
if not data: if not data:
return None return None
self.logger.debug('%s JSON: %s', (section, str(data))) self.logger.debug('%s JSON: %s', section, str(data))
for item in data: for item in data:
image_name = item.get('imagename') image_name = item.get('imagename')
if image_name is None: if image_name is None:

2
zuul.d/layout.yaml
View File

@ -19,6 +19,7 @@
- openstack-tox-py36 - openstack-tox-py36
- openstack-tox-py37 - openstack-tox-py37
- openstack-tox-py38 - openstack-tox-py38
- openstack-tox-py39
- tripleo-cross-tripleoclient-py37 - tripleo-cross-tripleoclient-py37
- tripleo-ci-centos-8-content-provider: - tripleo-ci-centos-8-content-provider:
dependencies: &deps_unit_lint dependencies: &deps_unit_lint
@ -26,6 +27,7 @@
- openstack-tox-py36 - openstack-tox-py36
- openstack-tox-py37 - openstack-tox-py37
- openstack-tox-py38 - openstack-tox-py38
- openstack-tox-py39
- tripleo-buildimage-overcloud-full-centos-8: - tripleo-buildimage-overcloud-full-centos-8:
dependencies: *deps_unit_lint dependencies: *deps_unit_lint
- tripleo-buildimage-ironic-python-agent-centos-8: - tripleo-buildimage-ironic-python-agent-centos-8: