Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Pin python idna library to v2.8
[releng/global-jjb.git]
/
shell
/
tox-run.sh
diff --git
a/shell/tox-run.sh
b/shell/tox-run.sh
index
c159891
..
c955466
100644
(file)
--- a/
shell/tox-run.sh
+++ b/
shell/tox-run.sh
@@
-10,27
+10,20
@@
##############################################################################
echo "---> tox-run.sh"
##############################################################################
echo "---> tox-run.sh"
-# Ensure we fail the job if any steps fail.
-# DO NOT set -u as virtualenv's activate script has unbound variables
-set -e -o pipefail
-
ARCHIVE_TOX_DIR="$WORKSPACE/archives/tox"
ARCHIVE_TOX_DIR="$WORKSPACE/archives/tox"
+ARCHIVE_DOC_DIR="$WORKSPACE/archives/docs"
mkdir -p "$ARCHIVE_TOX_DIR"
mkdir -p "$ARCHIVE_TOX_DIR"
-cd "$WORKSPACE/$TOX_DIR"
+cd "$WORKSPACE/$TOX_DIR"
|| exit 1
if [ -d "/opt/pyenv" ]; then
echo "---> Setting up pyenv"
export PYENV_ROOT="/opt/pyenv"
export PATH="$PYENV_ROOT/bin:$PATH"
if [ -d "/opt/pyenv" ]; then
echo "---> Setting up pyenv"
export PYENV_ROOT="/opt/pyenv"
export PATH="$PYENV_ROOT/bin:$PATH"
+ PYTHONPATH="$(pwd)"
+ export PYTHONPATH
+ export TOX_TESTENV_PASSENV=PYTHONPATH
fi
fi
-# Set and pass in PYTHONPATH to circumvent installation bug in tox>=3.2.0
-PYTHONPATH=$(pwd)
-export PYTHONPATH
-export TOX_TESTENV_PASSENV=PYTHONPATH
-
-set +e # Allow detox to fail so that we can collect the logs in the next step
-
PARALLEL="${PARALLEL:-true}"
if [ "${PARALLEL}" = true ]; then
if [ -n "$TOX_ENVS" ]; then
PARALLEL="${PARALLEL:-true}"
if [ "${PARALLEL}" = true ]; then
if [ -n "$TOX_ENVS" ]; then
@@
-56,8
+49,15
@@
for i in .tox/*/log; do
tox_env=$(echo "$i" | awk -F'/' '{print $2}')
cp -r "$i" "$ARCHIVE_TOX_DIR/$tox_env"
done
tox_env=$(echo "$i" | awk -F'/' '{print $2}')
cp -r "$i" "$ARCHIVE_TOX_DIR/$tox_env"
done
-set -e # Logs collected so re-enable
echo "Completed tox runs."
echo "Completed tox runs."
+
+# If docs are generated push them to archives.
+DOC_DIR="${DOC_DIR:-docs/_build/html}"
+if [[ -d "$DOC_DIR" ]]; then
+ echo "---> Archiving generated docs"
+ mv "$DOC_DIR" "$ARCHIVE_DOC_DIR"
+fi
+
test "$tox_status" -eq 0 || exit "$tox_status"
test "$tox_status" -eq 0 || exit "$tox_status"