Merge "Fix zuul failures during setup"

.zuul.yaml

@@ -60,6 +60,7 @@
     parent: tox
     description: |
       Run flake8 test for k8sapp-nginx-ingress-controller
+    nodeset: ubuntu-focal
     files:
       - python-k8sapp-nginx-ingress-controller/*
     vars:
@@ -88,6 +89,7 @@
     parent: tox
     description: |
       Run bandit test for k8sapp-nginx-ingress-controller
+    nodeset: ubuntu-focal
     files:
       - python-k8sapp-nginx-ingress-controller/*
     vars:

python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/requirements.txt

@@ -1,2 +1,3 @@
 pbr>=2.0.0
-PyYAML==3.13
+PyYAML==5.3.1;python_version>="3.9"
+PyYAML==3.1.3;python_version<"3.9"

python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/tox.ini

@@ -24,7 +24,6 @@ whitelist_externals = bash
 
 install_command = pip install \
     -v -v -v \
-    -c{toxinidir}/upper-constraints.txt \
     -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
     {opts} {packages}
 
@@ -41,15 +40,28 @@ setenv = VIRTUAL_ENV={envdir}
          TOX_WORK_DIR={toxworkdir}
          PYLINTHOME={toxworkdir}
 
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
-       -e{[tox]stxdir}/config/sysinv/sysinv/sysinv
-       -e{[tox]stxdir}/config/tsconfig/tsconfig
-       -e{[tox]stxdir}/fault/fm-api/source
-       -e{[tox]stxdir}/fault/python-fmclient/fmclient
-       -e{[tox]stxdir}/utilities/ceph/python-cephclient/python-cephclient
-       -e{[tox]stxdir}/update/cgcs-patch/cgcs-patch
+# centos patching base dir is cgcs-patch
+centos_deps = -r{toxinidir}/requirements.txt
+              -r{toxinidir}/test-requirements.txt
+              -e{[tox]stxdir}/config/sysinv/sysinv/sysinv
+              -e{[tox]stxdir}/config/tsconfig/tsconfig
+              -e{[tox]stxdir}/fault/fm-api/source
+              -e{[tox]stxdir}/fault/python-fmclient/fmclient
+              -e{[tox]stxdir}/utilities/ceph/python-cephclient/python-cephclient
+              -e{[tox]stxdir}/update/cgcs-patch/cgcs-patch
 
+# debian patching base dir is sw-patch
+debian_deps = -r{toxinidir}/requirements.txt
+              -r{toxinidir}/test-requirements.txt
+              -e{[tox]stxdir}/config/sysinv/sysinv/sysinv
+              -e{[tox]stxdir}/config/tsconfig/tsconfig
+              -e{[tox]stxdir}/fault/fm-api/source
+              -e{[tox]stxdir}/fault/python-fmclient/fmclient
+              -e{[tox]stxdir}/utilities/ceph/python-cephclient/python-cephclient
+              -e{[tox]stxdir}/update/sw-patch/cgcs-patch
+
+# default deps are still centos
+deps = {[testenv]centos_deps}
 
 commands =
   find . -type f -name "*.pyc" -delete
@@ -81,6 +93,7 @@ commands =
 
 [testenv:py39]
 basepython = python3.9
+deps = {[testenv]debian_deps}
 install_command = pip install \
     -v -v -v \
     -c{toxinidir}/upper-constraints.txt \
@@ -113,14 +126,14 @@ commands = bandit --ini tox.ini -n 5 -r k8sapp_nginx_ingress_controller
 basepython = python2.7
 sitepackages = False
 
-deps = {[testenv]deps}
+deps = {[testenv]centos_deps}
        pylint
 commands =
      pylint {posargs} k8sapp_nginx_ingress_controller --rcfile=./pylint.rc
 
 [testenv:cover]
 basepython = python2.7
-deps = {[testenv]deps}
+deps = {[testenv]centos_deps}
 setenv = {[testenv]setenv}
          PYTHON=coverage run --parallel-mode
 

python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/upper-constraints.txt

@@ -1 +1,3 @@
 # Override upstream constraints based on StarlingX load
+docker==4.1.0
+kubernetes==12.0.1