Configuring tox tests to allow serial or parallel execution configurable
within JJB by setting the PARALLEL parameter to true or false.
Issue: RELENG-912
Change-Id: If2edba598b47484b1708f1e0f3fb96f035511841
Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
- comment-added-contains-event:
comment-contains-value: recheck$
- comment-added-contains-event:
comment-contains-value: recheck$
#####################
# Job Configuration #
#####################
#####################
# Job Configuration #
#####################
submodule-recursive: '{submodule-recursive}'
choosing-strategy: gerrit
submodule-recursive: '{submodule-recursive}'
choosing-strategy: gerrit
+ parameters:
+ - bool:
+ name: PARALLEL
+ default: '{parallel}'
+ description: Tox test type used to configure serial or parallel testing.
+
+
triggers:
- gerrit:
server-name: '{gerrit-server-name}'
triggers:
- gerrit:
server-name: '{gerrit-server-name}'
fi
set +e # Allow detox to fail so that we can collect the logs in the next step
fi
set +e # Allow detox to fail so that we can collect the logs in the next step
-if [ ! -z "$TOX_ENVS" ]; then
- detox -e "$TOX_ENVS" | tee -a "$ARCHIVE_TOX_DIR/detox.log"
- detox_status="${PIPESTATUS[0]}"
+
+PARALLEL="${PARALLEL:-true}"
+if [ "${PARALLEL}" = true ]; then
+ if [ ! -z "$TOX_ENVS" ]; then
+ detox -e "$TOX_ENVS" | tee -a "$ARCHIVE_TOX_DIR/detox.log"
+ tox_status="${PIPESTATUS[0]}"
+ else
+ detox | tee -a "$ARCHIVE_TOX_DIR/detox.log"
+ tox_status="${PIPESTATUS[0]}"
+ fi
- detox | tee -a "$ARCHIVE_TOX_DIR/detox.log"
- detox_status="${PIPESTATUS[0]}"
+ if [ ! -z "$TOX_ENVS" ]; then
+ tox -e "$TOX_ENVS" | tee -a "$ARCHIVE_TOX_DIR/tox.log"
+ tox_status="${PIPESTATUS[0]}"
+ else
+ tox | tee -a "$ARCHIVE_TOX_DIR/tox.log"
+ tox_status="${PIPESTATUS[0]}"
+ fi
fi
# Disable SC2116 as we want to echo a space separated list of TOX_ENVS
fi
# Disable SC2116 as we want to echo a space separated list of TOX_ENVS
echo "Completed tox runs."
echo "Completed tox runs."
-test "$detox_status" -eq 0 || exit "$detox_status"
+test "$tox_status" -eq 0 || exit "$tox_status"