Simplify packer-parameters macro name to just lf

[releng/global-jjb.git] / shell / tox-run.sh

diff --git a/shell/tox-run.sh b/shell/tox-run.sh
index 6560094..7abdeea 100644 (file)
--- a/shell/tox-run.sh
+++ b/shell/tox-run.sh
@@ -1,15 +1,49 @@
 #!/bin/bash
-echo "---> tox-install.sh"
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2017 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+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 [ -n "$TOX_ENVS" ];
-then
-    tox -e "$TOX_ENVS"
+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
-    tox
+    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 .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"