From 57ec63d970935f3670caf8e5655fd85fa3b3aca1 Mon Sep 17 00:00:00 2001
From: Charles Short <charles.short@windriver.com>
Date: Tue, 31 Aug 2021 13:12:54 -0400
Subject: [PATCH] Fix pylint gate

Nodeset was not set so it tries to run the gate on the default
host, since the pylint gate is running in python2.7 it fails.
So set it to ubuntu-xenial. Also fix python2.7 because it
was failing as well.

Story: 2009101
Task: 43149

Signed-off-by: Charles Short <charles.short@windriver.com>
Change-Id: I7b3430fbf9a77ba6796e0b12136d0a266cba078e
---
 .zuul.yaml                                              | 1 +
 python-k8sapp-platform/k8sapp_platform/requirements.txt | 3 +--
 python-k8sapp-platform/k8sapp_platform/setup.py         | 2 +-
 python-k8sapp-platform/k8sapp_platform/tox.ini          | 4 +---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 3651b37..e55d93d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -70,6 +70,7 @@
     parent: tox
     description: |
       Run pylint test for k8sapp_platform
+    nodeset: ubuntu-xenial
     required-projects:
       - starlingx/config
       - starlingx/fault
diff --git a/python-k8sapp-platform/k8sapp_platform/requirements.txt b/python-k8sapp-platform/k8sapp_platform/requirements.txt
index 5de6e00..43f8edc 100644
--- a/python-k8sapp-platform/k8sapp_platform/requirements.txt
+++ b/python-k8sapp-platform/k8sapp_platform/requirements.txt
@@ -1,3 +1,2 @@
-pbr>=2.0.0
+pbr>=0.5
 PyYAML>=3.10
-
diff --git a/python-k8sapp-platform/k8sapp_platform/setup.py b/python-k8sapp-platform/k8sapp_platform/setup.py
index e8729b8..7008e2a 100644
--- a/python-k8sapp-platform/k8sapp_platform/setup.py
+++ b/python-k8sapp-platform/k8sapp_platform/setup.py
@@ -8,5 +8,5 @@ import setuptools
 
 
 setuptools.setup(
-    setup_requires=['pbr>=2.0.0'],
+    setup_requires=['pbr>=0.5'],
     pbr=True)
diff --git a/python-k8sapp-platform/k8sapp_platform/tox.ini b/python-k8sapp-platform/k8sapp_platform/tox.ini
index 6881f9d..56b99b8 100644
--- a/python-k8sapp-platform/k8sapp_platform/tox.ini
+++ b/python-k8sapp-platform/k8sapp_platform/tox.ini
@@ -10,11 +10,11 @@ stxdir = {toxinidir}/../../..
 distshare={toxworkdir}/.tox/distshare
 
 [testenv]
-# usedevelop = True
 # enabling usedevelop results in  py27 develop-inst:
 # Exception: Versioning for this project requires either an sdist tarball,
 # or access to an upstream git repository.
 # Note. site-packages is true and rpm-python must be yum installed on your dev machine.
+usedevelop = True
 sitepackages = True
 
 # tox is silly... these need to be separated by a newline....
@@ -167,8 +167,6 @@ commands = bandit --ini tox.ini -n 5 -r k8sapp_platform
 
 [testenv:pylint]
 basepython = python2.7
-sitepackages = False
-
 deps = {[testenv]deps}
        pylint
 commands =