From dd5a24037d1ba91047176b0b95d2f5acf62755eb Mon Sep 17 00:00:00 2001
From: Al Bailey <al.bailey@windriver.com>
Date: Thu, 6 Oct 2022 17:05:24 +0000
Subject: [PATCH] Fix bashate failure in zuul

This review allows this repo to pass zuul.

When tox is run locally it pulls in an older
bashate 0.6.0 but the zuul jobs are pulling in
the higher version.

Bashate 2.1.1 was releated Oct 6, 2022

Changed the upper constraints to allow developers
to pull in dependencies that are more aligned with zuul.

Fixed the new bashate error.
Also cleaned up the yamllint syntax.

Closes-Bug: 1991971
Signed-off-by: Al Bailey <al.bailey@windriver.com>
Change-Id: I9cda349a20c63f9d222a3c3fc3645c5ceb4c2751
---
 mtce/src/pmon/scripts/pmon-test.sh |  2 +-
 tox.ini                            | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/mtce/src/pmon/scripts/pmon-test.sh b/mtce/src/pmon/scripts/pmon-test.sh
index fda08a70..35594538 100755
--- a/mtce/src/pmon/scripts/pmon-test.sh
+++ b/mtce/src/pmon/scripts/pmon-test.sh
@@ -151,7 +151,7 @@ do
         debounce=1
         startuptime=1
         factor=1
-         # Not all processes can be stopped
+        # Not all processes can be stopped
         if [ "$process" == "pmond" -o "$process" == "sm" ] ; then
             echo "${process} stop not supported ... skipping"
             continue
diff --git a/tox.ini b/tox.ini
index 8e2ee447..86af971d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ skipsdist = True
 
 [testenv]
 install_command = pip install \
-    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
+    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} \
     {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          OS_STDOUT_CAPTURE=1
@@ -31,12 +31,11 @@ commands =
           -or -not -wholename \*/devstack/files/\* \
           -wholename \*/devstack/\*           \
          \)                                   \
-         -print0 | xargs -n 1 -0 bashate -v -i E010,E006"
-  bash -c "find {toxinidir}        \
-            \( -name middleware/io-monitor/recipes-common/io-monitor/io-monitor/io_monitor/test-tools/yaml/* -prune \) \
-            -o \( -name .tox -prune \)         \
-            -o -type f -name '*.yaml'       \
-            -print0 | xargs -0 yamllint"
+         -print0 | xargs -r -n 1 -0 bashate -v -i E010,E006"
+  bash -c "find {toxinidir}                     \
+        -name .tox -prune                       \
+        -o -type f -name '*.yaml'               \
+        -print0 | xargs -0 yamllint -f parsable"
 
 [testenv:pylint]
 basepython = python3