Fix detox logs not being archived

Since we immediately fail on any shell errors we miss log
collection at the end of the build. Fix detox part of script to
allow the log collection code to run.

Change-Id: I50bcd337224adcecbf028f08b56cfebe2e10a3d4
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/.jjb-test/expected-xml/gerrit-python-tox-verify-master b/.jjb-test/expected-xml/gerrit-python-tox-verify-master
index 30f2729..18976d1 100644 (file)
--- a/.jjb-test/expected-xml/gerrit-python-tox-verify-master
+++ b/.jjb-test/expected-xml/gerrit-python-tox-verify-master
@@ -337,19 +337,26 @@ if [ -d "/opt/pyenv" ]; then
     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"
 </command>
     </hudson.tasks.Shell>
   </builders>

diff --git a/.jjb-test/expected-xml/github-python-tox-verify-master b/.jjb-test/expected-xml/github-python-tox-verify-master
index 38ac0dd..d499bbd 100644 (file)
--- a/.jjb-test/expected-xml/github-python-tox-verify-master
+++ b/.jjb-test/expected-xml/github-python-tox-verify-master
@@ -299,19 +299,26 @@ if [ -d "/opt/pyenv" ]; then
     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"
 </command>
     </hudson.tasks.Shell>
   </builders>

diff --git a/shell/tox-run.sh b/shell/tox-run.sh
index dd67699..7abdeea 100644 (file)
--- a/shell/tox-run.sh
+++ b/shell/tox-run.sh
@@ -27,16 +27,23 @@ if [ -d "/opt/pyenv" ]; then
     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"