From d6eae89310f005abc87270c8cd82d0a7cd1778a2 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 18 May 2022 11:15:58 +0200 Subject: [PATCH] cephadm-ansible-prs: make tox 'not run everything' This makes tox run each environment explicitly one after the other. This way if an environment fails, tox stops its execution. Signed-off-by: Guillaume Abrioux --- cephadm-ansible-prs/build/build | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/cephadm-ansible-prs/build/build b/cephadm-ansible-prs/build/build index cb570e9b..e78a23ea 100644 --- a/cephadm-ansible-prs/build/build +++ b/cephadm-ansible-prs/build/build @@ -1,14 +1,16 @@ #!/bin/bash # the following two methods exist in scripts/build_utils.sh +# shellcheck disable=SC2034 pkgs=( "tox" ) TEMPVENV=$(create_venv_dir) VENV=${TEMPVENV}/bin set_centos_python3_version "python3.9" -install_python_packages $TEMPVENV "pkgs[@]" "pip==22.0.4" +install_python_packages "$TEMPVENV" "pkgs[@]" "pip==22.0.4" # XXX this might not be needed -source $VENV/activate +# shellcheck source=/dev/null +source "${VENV}"/activate WORKDIR=$(mktemp -td tox.XXXXXXXXXX) @@ -19,4 +21,9 @@ update_vagrant_boxes rm -rf "${HOME}"/ansible/facts/* -"${VENV}"/tox --workdir="${TEMPVENV}" -c tox.ini -r -v -- --provider=libvirt +tox_envs="$("$VENV"/tox -l)" + +for tox_env in "${tox_envs[@]}" +do + "${VENV}"/tox --workdir="${TEMPVENV}" -c tox.ini -r -v -e "${tox_env}" -- --provider=libvirt +done -- 2.39.5