X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=.jjb-test%2Fexpected-xml%2Fgithub-python-tox-verify-master;h=cbdff16554df8ca445cc40bfd161847620343f1d;hb=43a8f1147f4fecd2a10a4dcc4c943da4f7c3be56;hp=7081949f37c3d7bab4abf9070a80fd09ec6ca38e;hpb=444423bc66f9771b24eba844719c02e133964d67;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/github-python-tox-verify-master b/.jjb-test/expected-xml/github-python-tox-verify-master
index 7081949f..cbdff165 100644
--- a/.jjb-test/expected-xml/github-python-tox-verify-master
+++ b/.jjb-test/expected-xml/github-python-tox-verify-master
@@ -9,8 +9,9 @@
build-vm
false
-
+
$GIT_URL/$GERRIT_PROJECT/example-org/releng/ciman
+
@@ -99,28 +100,22 @@ Example: docs,py2,py3
$sha1
-
-
false
- false
- true
- false
false
Default
-
- true
-
- false
- false
+
+
+
false
true
false
+ false
10
@@ -134,8 +129,11 @@ Example: docs,py2,py3
false
+
+
^recheck$
+
false
true
true
@@ -236,6 +234,11 @@ lftools --version
# pipdeptree
+
+
+ PYTHON_VERSION=python3
+
+
#!/bin/bash
# SPDX-License-Identifier: EPL-1.0
@@ -253,7 +256,7 @@ 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
@@ -262,8 +265,10 @@ 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.
@@ -275,28 +280,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"