Allow tox-install to handle base python ver

[releng/global-jjb.git] / .jjb-test / expected-xml / github-python-tox-verify-master

diff --git a/.jjb-test/expected-xml/github-python-tox-verify-master b/.jjb-test/expected-xml/github-python-tox-verify-master
index 6d758b8..38ac0dd 100644 (file)
--- a/.jjb-test/expected-xml/github-python-tox-verify-master
+++ b/.jjb-test/expected-xml/github-python-tox-verify-master
@@ -236,6 +236,11 @@ lftools --version
 # pipdeptree
 </command>
     </hudson.tasks.Shell>
+    <EnvInjectBuilder>
+      <info>
+        <propertiesContent>PYTHON_VERSION=python3</propertiesContent>
+      </info>
+    </EnvInjectBuilder>
     <hudson.tasks.Shell>
       <command>#!/bin/bash
 # SPDX-License-Identifier: EPL-1.0
@@ -253,17 +258,19 @@ echo &quot;---&gt; tox-install.sh&quot;
 # DO NOT set -u as virtualenv's activate script has unbound variables
 set -e -o pipefail
 
-virtualenv --quiet &quot;/tmp/v/tox&quot;
+virtualenv --quiet -p &quot;$PYTHON_VERSION&quot; &quot;/tmp/v/tox&quot;
 # shellcheck source=/tmp/v/tox/bin/activate disable=SC1091
 source &quot;/tmp/v/tox/bin/activate&quot;
 pip install --quiet --upgrade pip
 pip install --quiet --upgrade pipdeptree
-pip install --quiet --upgrade tox argparse
+pip install --quiet --upgrade argparse detox tox tox-pyenv
 
 echo &quot;----&gt; Pip Dependency Tree&quot;
 pipdeptree
-
-#!/bin/bash
+</command>
+    </hudson.tasks.Shell>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
@@ -275,52 +282,34 @@ pipdeptree
 ##############################################################################
 echo &quot;---&gt; tox-run.sh&quot;
 
+# shellcheck source=/tmp/v/tox/bin/activate disable=SC1091
+source &quot;/tmp/v/tox/bin/activate&quot;
+
 # 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=&quot;$WORKSPACE/archives/tox&quot;
 mkdir -p &quot;$ARCHIVE_TOX_DIR&quot;
-
 cd &quot;$WORKSPACE/$TOX_DIR&quot;
 
-if [ -z &quot;$TOX_ENVS&quot; ]; then
-    TOX_ENVS=$(crudini --get tox.ini tox envlist)
+if [ -d &quot;/opt/pyenv&quot; ]; then
+    echo &quot;---&gt; Setting up pyenv&quot;
+    export PYENV_ROOT=&quot;/opt/pyenv&quot;
+    export PATH=&quot;$PYENV_ROOT/bin:$PATH&quot;
 fi
 
-run_tox() {
-    local log_dir=&quot;$1&quot;
-    local env=&quot;$2&quot;
-
-    # Sleep a random 10 second interval to workaround tox sdist
-    # conflicts due to building in the same dist directory.
-    sleep $[ ( $RANDOM % 10 )  + 1 ]s
-
-    echo &quot;-----&gt; Running tox $env&quot;
-    if ! tox -e $env &gt; &quot;$log_dir/tox-$env.log&quot;; then
-        echo &quot;$env&quot; &gt;&gt; &quot;$log_dir/failed-envs.log&quot;
-    fi
-}
-
-IFS=&quot; &quot; read -r -a TOX_ENVS &lt;&lt;&lt; &quot;${TOX_ENVS//,/ }&quot;
-if hash parallel 2&gt;/dev/null; then
-    export -f run_tox
-    parallel --jobs 200% &quot;run_tox $ARCHIVE_TOX_DIR {}&quot; ::: ${TOX_ENVS[*]}
+if [ ! -z &quot;$TOX_ENVS&quot; ]; then
+    detox -e &quot;$TOX_ENVS&quot;  | tee -a &quot;$ARCHIVE_TOX_DIR/detox.log&quot;
 else
-    for env in &quot;${TOX_ENVS[@]}&quot;; do
-        run_tox &quot;$ARCHIVE_TOX_DIR&quot; &quot;$env&quot;
-    done
+    detox | tee -a &quot;$ARCHIVE_TOX_DIR/detox.log&quot;
 fi
 
-if [ -f &quot;$ARCHIVE_TOX_DIR/failed-envs.log&quot; ]; then
-    mapfile -t failed_envs &lt; &lt;(cat &quot;$ARCHIVE_TOX_DIR/failed-envs.log&quot;)
-    for e in &quot;${failed_envs[@]}&quot;; do
-        echo &quot;cat $ARCHIVE_TOX_DIR/tox-$e.log&quot;
-        cat &quot;$ARCHIVE_TOX_DIR/tox-$e.log&quot;
-    done
-    echo &quot;ERROR: Failed the following builds: ${failed_envs[*]}&quot;
-    exit 1
-fi
+# Disable SC2116 as we want to echo a space separated list of TOX_ENVS
+# shellcheck disable=SC2116
+for i in $(echo &quot;${TOX_ENVS//,/ }&quot;); do
+    cp -r &quot;.tox/$i/log&quot; &quot;$ARCHIVE_TOX_DIR/$i&quot;
+done
 
 echo &quot;Completed tox runs.&quot;
 </command>