From 9c2a2e749dc16916cbca55f67e4e6ee3c190f6d3 Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Tue, 8 Dec 2020 15:40:21 +0100 Subject: [PATCH] Pass broken jobs with Python 3.8 (Ubuntu Focal and Fedora 32) - Pass linters and lower-constrains jobs with Python 3.8 - Use master version of pylint only with python version >= 3.9 - Update requirements files - Fix install_bindeps.sh - Disable running DevStack jobs on ubuntu focal nodes Change-Id: Ie745fe5b5a08fe088fcf39edb312170c6cbdc5bb --- linters-requirements.txt | 6 ++++-- lower-constraints.txt | 44 ++++++++++++++++++++-------------------- requirements.txt | 38 +++++++++++++++++----------------- tools/install-bindeps.sh | 2 +- zuul.d/project.yaml | 14 ++++++------- 5 files changed, 53 insertions(+), 51 deletions(-) diff --git a/linters-requirements.txt b/linters-requirements.txt index 5cbfd2dce..9004565a9 100644 --- a/linters-requirements.txt +++ b/linters-requirements.txt @@ -1,6 +1,8 @@ # pep8 and flake8 requirements ansible-lint == 4.2.0 # MIT -# pylint >= 2.6.1 # GPLv2 -git+https://github.com/PyCQA/pylint.git # GPLv2 +astroid>=2.4.0; python_version < '3.8' # LGPLv2.1 +git+https://github.com/PyCQA/astroid.git@master; python_version >= '3.8' # LGPLv2.1 +git+https://github.com/PyCQA/pylint.git@master; python_version >= '3.8' # GPLv2 pre-commit >= 2.6.0 # MIT +pylint >= 2.6.0; python_version < '3.8' # GPLv2 diff --git a/lower-constraints.txt b/lower-constraints.txt index 70210d90e..a1341b8cd 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -1,28 +1,28 @@ # Tobiko framework requirements -coverage==4.5.0 -docker==4.0.0 +coverage==5.3.0 +docker==4.4.0 fixtures==3.0.0 -keystoneauth1==3.18.0 -Jinja2==2.10.0 +keystoneauth1==4.3.0 +Jinja2==2.11.2 junitxml==0.7.0 -mock==2.0.0 -netaddr==0.7.18 -neutron-lib==1.25.0 -os-testr==1.0.0 -oslo.config==5.2.0 -oslo.log==3.36.0 -paramiko==2.4.0 -pbr==4.0.4 +mock==3.0.5 +netaddr==0.8.0 +neutron-lib==2.7.0 +os-testr==2.0.0 +oslo.config==8.4.0 +oslo.log==4.4.0 +paramiko==2.7.2 +pbr==5.5.1 podman==1.6.0 -python-heatclient==1.5.0 -python-glanceclient==2.16.0 -python-neutronclient==6.7.0 -python-novaclient==9.1.0 -python-octaviaclient==1.9.0 -python-openstackclient==3.12.0 +python-heatclient==2.3.0 +python-glanceclient==3.2.2 +python-neutronclient==7.2.1 +python-novaclient==17.2.1 +python-octaviaclient==2.2.0 +python-openstackclient==5.4.0 python-subunit==1.4.0 -six==1.11.0 -sshtunnel==0.1.5 -stestr==3.0.0 -testtools==2.2.0 +six==1.15.0 +sshtunnel==0.3.1 +stestr==3.1.0 +testtools==2.4.0 diff --git a/requirements.txt b/requirements.txt index 7b4a85249..d7ad7d507 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,24 +1,24 @@ # Tobiko framework requirements -docker>=4.0.0 # Apache-2.0 +docker>=4.4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD -Jinja2>=2.10.0 # BSD +Jinja2>=2.11.2 # BSD junitxml>=0.7.0 # MIT -keystoneauth1>=3.18.0 # Apache-2.0 -netaddr>=0.7.18 # BSD -neutron-lib>=1.25.0 # Apache-2.0 -oslo.config>=5.2.0 # Apache-2.0 -oslo.log>=3.36.0 # Apache-2.0 -paramiko>=2.4.0 # LGPLv2.1 -pbr>=4.0.4 # Apache-2.0 +keystoneauth1>=4.3.0 # Apache-2.0 +netaddr>=0.8.0 # BSD +neutron-lib>=2.7.0 # Apache-2.0 +oslo.config>=8.4.0 # Apache-2.0 +oslo.log>=4.4.0 # Apache-2.0 +paramiko>=2.7.2 # LGPLv2.1 +pbr>=5.5.1 # Apache-2.0 podman>=1.6.0 # Apache-2.0 -python-glanceclient>=2.16.0 # Apache-2.0 -python-heatclient>=1.5.0 # Apache-2.0 -python-neutronclient>=6.7.0 # Apache-2.0 -python-novaclient>=9.1.0 # Apache-2.0 -python-octaviaclient>=1.9.0 # Apache-2.0 -python-openstackclient>=3.12.0 # Apache-2.0 -six>=1.11.0 # MIT -sshtunnel>=0.2.2 # MIT -stestr>=2.0.0 # Apache-2.0 -testtools>=2.2.0 # MIT +python-glanceclient>=3.2.2 # Apache-2.0 +python-heatclient>=2.3.0 # Apache-2.0 +python-neutronclient>=7.2.1 # Apache-2.0 +python-novaclient>=17.2.1 # Apache-2.0 +python-octaviaclient>=2.2.0 # Apache-2.0 +python-openstackclient>=5.4.0 # Apache-2.0 +six>=1.15.0 # MIT +sshtunnel>=0.3.1 # MIT +stestr>=3.1.0 # Apache-2.0 +testtools>=2.4.0 # MIT diff --git a/tools/install-bindeps.sh b/tools/install-bindeps.sh index 4ad6a43dc..f940cacb8 100755 --- a/tools/install-bindeps.sh +++ b/tools/install-bindeps.sh @@ -5,6 +5,6 @@ set -ex INSTALL_PACKAGE=$(which yum || which apt) if ! tox -e bindep ; then - .tox/bindep/bin/bindep -b | xargs -r "${INSTALL_PACKAGE}" install -y + .tox/bindep/bin/bindep -b | xargs -r sudo "${INSTALL_PACKAGE}" install -y .tox/bindep/bin/bindep fi diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 2ad30dc75..a93ac203f 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -13,15 +13,15 @@ check: jobs: - - devstack-tobiko-functional-centos + # - devstack-tobiko-functional-centos # - devstack-tobiko-functional-ubuntu - - devstack-tobiko-functional-ovn-centos + # - devstack-tobiko-functional-ovn-centos # - devstack-tobiko-functional-ovn-ubuntu - - devstack-tobiko-faults-centos + # - devstack-tobiko-faults-centos # - devstack-tobiko-faults-ubuntu # - devstack-tobiko-faults-ovn-centos # - devstack-tobiko-faults-ovn-ubuntu - - devstack-tobiko-scenario-ovn-centos + # - devstack-tobiko-scenario-ovn-centos # - devstack-tobiko-scenario-ovn-ubuntu - tobiko-tox-infrared-centos-7 - tobiko-tox-infrared-centos-8 @@ -30,11 +30,11 @@ gate: jobs: - - devstack-tobiko-functional-centos + # - devstack-tobiko-functional-centos # - devstack-tobiko-functional-ubuntu - - devstack-tobiko-functional-ovn-centos + # - devstack-tobiko-functional-ovn-centos # - devstack-tobiko-functional-ovn-ubuntu - - devstack-tobiko-scenario-ovn-centos + # - devstack-tobiko-scenario-ovn-centos # - devstack-tobiko-scenario-ovn-ubuntu - tobiko-tox-infrared-centos-8