starlingx/metal
Code Issues Proposed changes

Fix bashate failure in zuul

Browse Source 
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
This commit is contained in:
Al Bailey 2022-10-06 17:05:24 +00:00
parent f644aa29b0
commit dd5a24037d
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mtce/src/pmon/scripts/pmon-test.sh
View File

@ -151,7 +151,7 @@ do
debounce=1 debounce=1
startuptime=1 startuptime=1
factor=1 factor=1
# Not all processes can be stopped # Not all processes can be stopped
if [ "$process" == "pmond" -o "$process" == "sm" ] ; then if [ "$process" == "pmond" -o "$process" == "sm" ] ; then
echo "${process} stop not supported ... skipping" echo "${process} stop not supported ... skipping"
continue continue

13
tox.ini
View File

@ -5,7 +5,7 @@ skipsdist = True
[testenv] [testenv]
install_command = pip install \ 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} {opts} {packages}
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
OS_STDOUT_CAPTURE=1 OS_STDOUT_CAPTURE=1
@ -31,12 +31,11 @@ commands =
-or -not -wholename \*/devstack/files/\* \ -or -not -wholename \*/devstack/files/\* \
-wholename \*/devstack/\* \ -wholename \*/devstack/\* \
\) \ \) \
-print0 | xargs -n 1 -0 bashate -v -i E010,E006" -print0 | xargs -r -n 1 -0 bashate -v -i E010,E006"
bash -c "find {toxinidir} \ bash -c "find {toxinidir} \
\( -name middleware/io-monitor/recipes-common/io-monitor/io-monitor/io_monitor/test-tools/yaml/* -prune \) \ -name .tox -prune \
-o \( -name .tox -prune \) \ -o -type f -name '*.yaml' \
-o -type f -name '*.yaml' \ -print0 | xargs -0 yamllint -f parsable"
-print0 | xargs -0 yamllint"
[testenv:pylint] [testenv:pylint]
basepython = python3 basepython = python3