From a2afedf7328dcebcc99a539070686692d4949eee Mon Sep 17 00:00:00 2001
From: Al Bailey <al.bailey@windriver.com>
Date: Fri, 28 Oct 2022 17:21:19 +0000
Subject: [PATCH] Fix zuul failures during setup

The ubuntu-jammy nodeset gets selected by default
and is causing problems during setup.

Collecting cffi>=1.1
Failed to build cffi

ubuntu-bionic works if using stein upper-constraints.
ubuntu-focal works if using the debian upper-constraints.

Need to update a file that is monitored by zuul
in order to trigger the failing zuul jobs.

Partial-Bug: 1994843

Signed-off-by: Al Bailey <al.bailey@windriver.com>
Change-Id: Ib6180ec2143526d1f1819a47dc47adc5f27aeb57
---
 .zuul.yaml                                       | 1 +
 python-k8sapp-portieris/k8sapp_portieris/tox.ini | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 37296e2..06369d6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -50,6 +50,7 @@
     parent: tox
     description: |
       Run pylint test for k8sapp_portieris
+    nodeset: ubuntu-bionic
     required-projects:
       - starlingx/config
       - starlingx/fault
diff --git a/python-k8sapp-portieris/k8sapp_portieris/tox.ini b/python-k8sapp-portieris/k8sapp_portieris/tox.ini
index 4a130c3..16c775f 100644
--- a/python-k8sapp-portieris/k8sapp_portieris/tox.ini
+++ b/python-k8sapp-portieris/k8sapp_portieris/tox.ini
@@ -39,6 +39,7 @@ setenv = VIRTUAL_ENV={envdir}
          TOX_WORK_DIR={toxworkdir}
          PYLINTHOME={toxworkdir}
 
+# the path to cgcs-patch needs to be updated to sw-patch
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
        -e{[tox]stxdir}/config/sysinv/sysinv/sysinv
@@ -109,7 +110,7 @@ commands = bandit --ini tox.ini -n 5 -r k8sapp_portieris
 [testenv:pylint]
 basepython = python3
 sitepackages = False
-
+# If this target is run on python3.8 or later, the install_command needs the debian upper-constaints
 deps = {[testenv]deps}
        pylint
 commands =