From 49e39fa949850a7d6fc6083539a4cd3390e6172b Mon Sep 17 00:00:00 2001
From: Charles Short <charles.short@windriver.com>
Date: Fri, 28 May 2021 08:55:08 -0400
Subject: [PATCH] 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>
---
 .zuul.yaml                                                 | 7 +++++++
 cgcs-patch/cgcs-patch/pylint.rc                            | 3 ++-
 cgcs-patch/cgcs-patch/test-requirements.txt                | 5 ++++-
 cgcs-patch/cgcs-patch/tox.ini                              | 5 +----
 patch-alarm/patch-alarm/patch_alarm/patch_alarm_manager.py | 2 +-
 tox.ini                                                    | 4 ++--
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 17d73dd3..1a1b3010 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -39,6 +39,7 @@
 - job:
     name: py3-flake8
     parent: tox
+    nodeset: ubuntu-bionic
     required-projects:
       - starlingx/config
       - starlingx/fault
@@ -48,6 +49,7 @@
 - job:
     name: patch-tox-pylint
     parent: tox
+    nodeset: ubuntu-bionic
     required-projects:
       - starlingx/config
       - starlingx/fault
@@ -60,6 +62,7 @@
 - job:
     name: patch-tox-py27
     parent: tox
+    nodeset: ubuntu-xenial
     required-projects:
       - starlingx/config
       - starlingx/fault
@@ -72,6 +75,7 @@
 - job:
     name: patch-tox-py36
     parent: tox
+    nodeset: ubuntu-bionic
     required-projects:
       - starlingx/config
       - starlingx/fault
@@ -84,6 +88,7 @@
 - job:
     name: patch-alarm-tox-pylint
     parent: tox
+    nodeset: ubuntu-bionic
     required-projects:
       - starlingx/config
       - starlingx/fault
@@ -96,6 +101,7 @@
 - job:
     name: patch-alarm-tox-py27
     parent: tox
+    nodeset: ubuntu-xenial
     required-projects:
       - starlingx/config
       - starlingx/fault
@@ -108,6 +114,7 @@
 - job:
     name: patch-alarm-tox-py36
     parent: tox
+    nodeset: ubuntu-bionic
     required-projects:
       - starlingx/config
       - starlingx/fault
diff --git a/cgcs-patch/cgcs-patch/pylint.rc b/cgcs-patch/cgcs-patch/pylint.rc
index d8aa305c..3ade8e10 100644
--- a/cgcs-patch/cgcs-patch/pylint.rc
+++ b/cgcs-patch/cgcs-patch/pylint.rc
@@ -50,7 +50,8 @@ symbols=no
 # W0703 broad-except
 # W0707 raise-missing-from
 # 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]
diff --git a/cgcs-patch/cgcs-patch/test-requirements.txt b/cgcs-patch/cgcs-patch/test-requirements.txt
index 85bf419f..d0900878 100644
--- a/cgcs-patch/cgcs-patch/test-requirements.txt
+++ b/cgcs-patch/cgcs-patch/test-requirements.txt
@@ -3,8 +3,11 @@
 # process, which may cause wedges in the gate later.
 
 hacking>=1.1.0,<=2.0.0 # Apache-2.0
-
+astroid <= 2.2.5
 coverage!=4.4,>=4.0 # Apache-2.0
 mock>=2.0.0 # BSD
 stestr>=1.0.0 # Apache-2.0
 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
diff --git a/cgcs-patch/cgcs-patch/tox.ini b/cgcs-patch/cgcs-patch/tox.ini
index 135784f0..0cda032b 100644
--- a/cgcs-patch/cgcs-patch/tox.ini
+++ b/cgcs-patch/cgcs-patch/tox.ini
@@ -116,10 +116,7 @@ commands =
     flake8 {posargs} .
 
 [testenv:pylint]
-basepython = python3
-deps = {[testenv]deps}
-       pylint
-sitepackages = False
+basepython = python3.6
 commands = pylint cgcs_patch --rcfile=./pylint.rc
            pylint cgcs_make_patch --rcfile=./pylint_make_patch.rc
 
diff --git a/patch-alarm/patch-alarm/patch_alarm/patch_alarm_manager.py b/patch-alarm/patch-alarm/patch_alarm/patch_alarm_manager.py
index e3efd535..356553ca 100644
--- a/patch-alarm/patch-alarm/patch_alarm/patch_alarm_manager.py
+++ b/patch-alarm/patch-alarm/patch_alarm/patch_alarm_manager.py
@@ -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
 
diff --git a/tox.ini b/tox.ini
index 4d62b3e7..06d9b84f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -82,8 +82,8 @@ filename=
 #      that end up quite wide
 # F401 'XXXXX' imported but unused
 show-source = True
-ignore = H101,H102,H105,H306,H401,H404,H405,
-         W504,E501,F401
+ignore = H101,H102,H105,H306,H401,H404,H405,H216,
+         W504,E501,F401,
 exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,release-tag-*
 # H106: Don't put vim configuration in source files (off by default).
 # H203: Use assertIs(Not)None to check for None (off by default).