X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgerrit-python-tox-verify-master;h=18976d10ebe5c77fd72d33322efdbac5a1f895ec;hb=f6f5ec828da8600ea0602752c63058d0c50b235d;hp=497228efcbd8510c8618cf1cc24f27043fa4c652;hpb=32872573cb431a8479e75d159350b8184bb9d62e;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/gerrit-python-tox-verify-master b/.jjb-test/expected-xml/gerrit-python-tox-verify-master
index 497228ef..18976d10 100644
--- a/.jjb-test/expected-xml/gerrit-python-tox-verify-master
+++ b/.jjb-test/expected-xml/gerrit-python-tox-verify-master
@@ -274,6 +274,11 @@ lftools --version
# pipdeptree
+
+
+ PYTHON_VERSION=python3
+
+
#!/bin/bash
# SPDX-License-Identifier: EPL-1.0
@@ -291,17 +296,19 @@ echo "---> tox-install.sh"
# DO NOT set -u as virtualenv's activate script has unbound variables
set -e -o pipefail
-virtualenv --quiet "/tmp/v/tox"
+virtualenv --quiet -p "$PYTHON_VERSION" "/tmp/v/tox"
# shellcheck source=/tmp/v/tox/bin/activate disable=SC1091
source "/tmp/v/tox/bin/activate"
pip install --quiet --upgrade pip
pip install --quiet --upgrade pipdeptree
-pip install --quiet --upgrade detox tox argparse
+pip install --quiet --upgrade argparse detox tox tox-pyenv
echo "----> Pip Dependency Tree"
pipdeptree
-
-#!/bin/bash
+
+
+
+ #!/bin/bash
# SPDX-License-Identifier: EPL-1.0
##############################################################################
# Copyright (c) 2017 The Linux Foundation and others.
@@ -313,28 +320,43 @@ pipdeptree
##############################################################################
echo "---> tox-run.sh"
+# shellcheck source=/tmp/v/tox/bin/activate disable=SC1091
+source "/tmp/v/tox/bin/activate"
+
# 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"
mkdir -p "$ARCHIVE_TOX_DIR"
-
cd "$WORKSPACE/$TOX_DIR"
+if [ -d "/opt/pyenv" ]; then
+ echo "---> Setting up pyenv"
+ export PYENV_ROOT="/opt/pyenv"
+ export PATH="$PYENV_ROOT/bin:$PATH"
+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]}"
else
detox | tee -a "$ARCHIVE_TOX_DIR/detox.log"
+ detox_status="${PIPESTATUS[0]}"
fi
# Disable SC2116 as we want to echo a space separated list of TOX_ENVS
# shellcheck disable=SC2116
-for i in $(echo "${TOX_ENVS//,/ }"); do
- cp -r ".tox/$i/log" "$ARCHIVE_TOX_DIR/$i"
+for i in .tox/*/log; do
+ 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."
+
+test "$detox_status" -eq 0 || exit "$detox_status"