From 5b85f19a5deb126b4f1a52e123d228e047396aa6 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 6 Mar 2019 11:27:30 +0100 Subject: [PATCH] ceph-ansible: split tox ini file the tox.ini file in ceph-ansible became too big, this commit is a first step to split this file. Signed-off-by: Guillaume Abrioux --- scripts/build_utils.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index 59eb1694..50353273 100644 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -753,11 +753,20 @@ function build_job_name() { # shellcheck disable=SC2153 ENV_NAME="$(build_job_name "$RELEASE" "$DISTRIBUTION" "$DEPLOYMENT" "$SCENARIO")" +case $SCENARIO in + update) + TOX_INI_FILE=tox-update.ini + ;; + *) + TOX_INI_FILE=tox.ini + ;; +esac + for tox_env in $("$VENV"/tox -l) do if [[ "$ENV_NAME" == "$tox_env" ]]; then # shellcheck disable=SC2116 - if ! eval "$(echo "${TOX_RUN_ENV[@]}")" "$VENV"/tox --workdir="$TEMPVENV" -v -e="$ENV_NAME" -- --provider=libvirt; then echo "ERROR: Job didn't complete successfully or got stuck for more than 3h." + if ! eval "$(echo "${TOX_RUN_ENV[@]}")" "$VENV"/tox -c "$TOX_INI_FILE" --workdir="$TEMPVENV" -v -e="$ENV_NAME" -- --provider=libvirt; then echo "ERROR: Job didn't complete successfully or got stuck for more than 3h." exit 1 fi return 0 -- 2.39.5