]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-ansible: split tox ini file 1263/head
authorGuillaume Abrioux <gabrioux@redhat.com>
Wed, 6 Mar 2019 10:27:30 +0000 (11:27 +0100)
committerGuillaume Abrioux <gabrioux@redhat.com>
Wed, 6 Mar 2019 10:27:30 +0000 (11:27 +0100)
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 <gabrioux@redhat.com>
scripts/build_utils.sh

index 59eb1694e1fb4862d167372b2eee27a02bf648ad..503532736f8e8f523036e72303aae3747898952f 100644 (file)
@@ -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