Adding py39 gate and removing py36 gates from zuul

Adding py39 gate.
Removing redundant py36 Zuul jobs since we now have py39 Zuul jobs in
place with the debian nodeset

Story: 2006796
Task: 42980
Signed-off-by: Bernardo Decco <bernardo.deccodesiqueira@windriver.com>
Change-Id: I9a3d047b81c599b96b4ace040be237d16b655c99
This commit is contained in:
Charles Short 2021-08-10 13:58:16 -04:00 committed by albailey
parent 73c2c164f4
commit 4bc8d1cf82
6 changed files with 46 additions and 8 deletions

View File

@ -10,14 +10,14 @@
- openstack-tox-linters - openstack-tox-linters
- stx-distcloud-tox-pep8 - stx-distcloud-tox-pep8
- stx-distcloud-tox-py27 - stx-distcloud-tox-py27
- stx-distcloud-tox-py36 - stx-distcloud-tox-py39
- stx-distcloud-tox-pylint - stx-distcloud-tox-pylint
gate: gate:
jobs: jobs:
- openstack-tox-linters - openstack-tox-linters
- stx-distcloud-tox-pep8 - stx-distcloud-tox-pep8
- stx-distcloud-tox-py27 - stx-distcloud-tox-py27
- stx-distcloud-tox-py36 - stx-distcloud-tox-py39
- stx-distcloud-tox-pylint - stx-distcloud-tox-pylint
post: post:
jobs: jobs:
@ -38,17 +38,21 @@
tox_extra_args: -c distributedcloud/tox.ini tox_extra_args: -c distributedcloud/tox.ini
- job: - job:
name: stx-distcloud-tox-py36 name: stx-distcloud-tox-py39
parent: tox parent: tox-py39
description: Run py36 for distcloud description: Run py39 for distcloud
nodeset: ubuntu-bionic nodeset: ubuntu-focal
pre-run:
- tools/gate/playbooks/install-postgresql.yaml
required-projects: required-projects:
- starlingx/fault - starlingx/fault
- starlingx/nfv - starlingx/nfv
- starlingx/update - starlingx/update
- starlingx/config - starlingx/config
- starlingx/root
vars: vars:
tox_envlist: py36 python_version: 3.9
tox_envlist: py39
tox_extra_args: -c distributedcloud/tox.ini tox_extra_args: -c distributedcloud/tox.ini
- job: - job:

View File

@ -21,3 +21,4 @@ pylint==1.9.2;python_version<"3.0" # GPLv2
pylint==2.3.1;python_version>="3.0" # GPLv2 pylint==2.3.1;python_version>="3.0" # GPLv2
PyYAML>=3.1.0 PyYAML>=3.1.0
yamllint<1.26.1;python_version>="3.0" # GPLv2 yamllint<1.26.1;python_version>="3.0" # GPLv2
python-dev-tools;python_version>="3.0"

View File

@ -1,5 +1,5 @@
[tox] [tox]
envlist = pep8,py27,pylint envlist = pep8,py27,py39,pylint
minversion = 2.3 minversion = 2.3
skipsdist = True skipsdist = True
@ -16,6 +16,7 @@ fm_api_src_dir = {[dc]stx_fault_dir}/fm-api/source
tsconfig_src_dir = ../../config/tsconfig/tsconfig tsconfig_src_dir = ../../config/tsconfig/tsconfig
cgtsclient_src_dir = ../../config/sysinv/cgts-client/cgts-client cgtsclient_src_dir = ../../config/sysinv/cgts-client/cgts-client
cgcs_patch_src_dir = ../../update/cgcs-patch/cgcs-patch cgcs_patch_src_dir = ../../update/cgcs-patch/cgcs-patch
stx_root_dir = ../../root
[testenv] [testenv]
sitepackages = False sitepackages = False
@ -65,6 +66,24 @@ commands =
find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete
python setup.py testr --slowest --testr-args='{posargs}' python setup.py testr --slowest --testr-args='{posargs}'
[testenv:py39]
basepython = python3.9
install_command = pip install -v -v -v \
-c {[dc]stx_root_dir}/build-tools/requirements/debian/upper-constraints.txt \
{opts} {packages}
deps = -r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
keyring
-e{[dc]nfv_client_src_dir}
-e{[dc]tsconfig_src_dir}
-e{[dc]fmclient_src_dir}
-e{[dc]fm_api_src_dir}
-e{[dc]cgtsclient_src_dir}
commands =
find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete
python setup.py testr --slowest --testr-args='{posargs}'
[testenv:debug-py27] [testenv:debug-py27]
basepython = python2.7 basepython = python2.7
commands = oslo_debug_helper {posargs} commands = oslo_debug_helper {posargs}

View File

@ -0,0 +1,5 @@
---
- hosts: all
gather_facts: false
roles:
- install-postgresql

1
tools/gate/playbooks/roles Symbolic link
View File

@ -0,0 +1 @@
../roles/

View File

@ -0,0 +1,8 @@
---
- name: Install postgresql
shell: |
set -xe
apt-get update -y
apt-get install -y libffi-dev libxml2-dev libxslt1-dev libldap2-dev \
libsasl2-dev libpq-dev libyaml-dev
become: true