Specify the nodeset zuul jobs

The py2.7 jobs need to specify xenial
The py3.6 jobs need to specify bionic
The focal zuul nodes only have python 3.8 installed in them

Zuul targets that invoke a generic python3 interpreter such
as pep8 is not specified.

Also ignore H216 since we still use py2.7.

The copyright date was updated in order to trigger
the zuul jobs, as a no-delta type of change.

Partial-Bug: 1928978

Signed-off-by: Charles Short <charles.short@windriver.com>
Change-Id: I81fd790dfc8a665a4e4e0ff59a013af7921b6e06
Signed-off-by: Charles Short <charles.short@windriver.com>
This commit is contained in:
Charles Short 2021-05-28 08:55:08 -04:00
parent 6a019e60c3
commit 49e39fa949
6 changed files with 17 additions and 9 deletions

View File

@ -39,6 +39,7 @@
- job: - job:
name: py3-flake8 name: py3-flake8
parent: tox parent: tox
nodeset: ubuntu-bionic
required-projects: required-projects:
- starlingx/config - starlingx/config
- starlingx/fault - starlingx/fault
@ -48,6 +49,7 @@
- job: - job:
name: patch-tox-pylint name: patch-tox-pylint
parent: tox parent: tox
nodeset: ubuntu-bionic
required-projects: required-projects:
- starlingx/config - starlingx/config
- starlingx/fault - starlingx/fault
@ -60,6 +62,7 @@
- job: - job:
name: patch-tox-py27 name: patch-tox-py27
parent: tox parent: tox
nodeset: ubuntu-xenial
required-projects: required-projects:
- starlingx/config - starlingx/config
- starlingx/fault - starlingx/fault
@ -72,6 +75,7 @@
- job: - job:
name: patch-tox-py36 name: patch-tox-py36
parent: tox parent: tox
nodeset: ubuntu-bionic
required-projects: required-projects:
- starlingx/config - starlingx/config
- starlingx/fault - starlingx/fault
@ -84,6 +88,7 @@
- job: - job:
name: patch-alarm-tox-pylint name: patch-alarm-tox-pylint
parent: tox parent: tox
nodeset: ubuntu-bionic
required-projects: required-projects:
- starlingx/config - starlingx/config
- starlingx/fault - starlingx/fault
@ -96,6 +101,7 @@
- job: - job:
name: patch-alarm-tox-py27 name: patch-alarm-tox-py27
parent: tox parent: tox
nodeset: ubuntu-xenial
required-projects: required-projects:
- starlingx/config - starlingx/config
- starlingx/fault - starlingx/fault
@ -108,6 +114,7 @@
- job: - job:
name: patch-alarm-tox-py36 name: patch-alarm-tox-py36
parent: tox parent: tox
nodeset: ubuntu-bionic
required-projects: required-projects:
- starlingx/config - starlingx/config
- starlingx/fault - starlingx/fault

View File

@ -50,7 +50,8 @@ symbols=no
# W0703 broad-except # W0703 broad-except
# W0707 raise-missing-from # W0707 raise-missing-from
# W1505, deprecated-method # W1505, deprecated-method
disable=C, R, W0107, W0511, W0603, W0703, W0707, W1505 # H216, unittest mock
disable=C, H216, R, W0107, W0511, W0603, W0703, W0707, W1505
[REPORTS] [REPORTS]

View File

@ -3,8 +3,11 @@
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
hacking>=1.1.0,<=2.0.0 # Apache-2.0 hacking>=1.1.0,<=2.0.0 # Apache-2.0
astroid <= 2.2.5
coverage!=4.4,>=4.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0
mock>=2.0.0 # BSD mock>=2.0.0 # BSD
stestr>=1.0.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0
testtools>=2.2.0 # MIT testtools>=2.2.0 # MIT
isort<5;python_version>="3.0"
pylint<2.1.0;python_version<"3.0" # GPLv2
pylint<2.4.0;python_version>="3.0" # GPLv2

View File

@ -116,10 +116,7 @@ commands =
flake8 {posargs} . flake8 {posargs} .
[testenv:pylint] [testenv:pylint]
basepython = python3 basepython = python3.6
deps = {[testenv]deps}
pylint
sitepackages = False
commands = pylint cgcs_patch --rcfile=./pylint.rc commands = pylint cgcs_patch --rcfile=./pylint.rc
pylint cgcs_make_patch --rcfile=./pylint_make_patch.rc pylint cgcs_make_patch --rcfile=./pylint_make_patch.rc

View File

@ -1,5 +1,5 @@
""" """
Copyright (c) 2014 Wind River Systems, Inc. Copyright (c) 2014-2021 Wind River Systems, Inc.
SPDX-License-Identifier: Apache-2.0 SPDX-License-Identifier: Apache-2.0

View File

@ -82,8 +82,8 @@ filename=
# that end up quite wide # that end up quite wide
# F401 'XXXXX' imported but unused # F401 'XXXXX' imported but unused
show-source = True show-source = True
ignore = H101,H102,H105,H306,H401,H404,H405, ignore = H101,H102,H105,H306,H401,H404,H405,H216,
W504,E501,F401 W504,E501,F401,
exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,release-tag-* exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,release-tag-*
# H106: Don't put vim configuration in source files (off by default). # H106: Don't put vim configuration in source files (off by default).
# H203: Use assertIs(Not)None to check for None (off by default). # H203: Use assertIs(Not)None to check for None (off by default).