From 22b99714e81e15e9ba5c951cc2a107287c647c89 Mon Sep 17 00:00:00 2001
From: Al Bailey <al.bailey@windriver.com>
Date: Fri, 28 Oct 2022 17:19:35 +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-focal seem to work fine.
Will specify the nodeset to be focal to resolve this.

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: Ibdc17a5f2b9480cf85a3d1f34f04dc8f70e60768
---
 .zuul.yaml                             | 2 ++
 python-k8sapp-oidc/k8sapp_oidc/tox.ini | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.zuul.yaml b/.zuul.yaml
index f2c853a..b5853bb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -61,6 +61,7 @@
     parent: tox
     description: |
       Run flake8 test for k8sapp_oidc
+    nodeset: ubuntu-focal
     files:
       - python-k8sapp-oidc/*
     vars:
@@ -89,6 +90,7 @@
     parent: tox
     description: |
       Run bandit test for k8sapp_oidc
+    nodeset: ubuntu-focal
     files:
       - python-k8sapp-oidc/*
     vars:
diff --git a/python-k8sapp-oidc/k8sapp_oidc/tox.ini b/python-k8sapp-oidc/k8sapp_oidc/tox.ini
index ebe4889..144e430 100644
--- a/python-k8sapp-oidc/k8sapp_oidc/tox.ini
+++ b/python-k8sapp-oidc/k8sapp_oidc/tox.ini
@@ -38,6 +38,7 @@ setenv = VIRTUAL_ENV={envdir}
          TOX_WORK_DIR={toxworkdir}
          PYLINTHOME={toxworkdir}
 
+# The path for cgcs-patch should be updated to sw-patch
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
        -e{[tox]stxdir}/config/tsconfig/tsconfig