summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorAndrew Grimberg <agrimberg@linuxfoundation.org>2022-12-06 14:11:20 +0000
committerGerrit Code Review <gerrit@onap.org>2022-12-06 14:11:20 +0000
commit7b37c8b5ad5347daaa43be59fbcfa60c7b4affad (patch)
tree6eb6971e253816f333497262194552a30bdf5737 /jjb
parent3e9e4eea215cddfeae37e0318414ac812469d453 (diff)
parent1a16d1d25ca0f16cb14af1f62847ccea6297b6cc (diff)
Merge "Fix: Ensure tox is run under Python3"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/global-templates-python.yaml25
1 files changed, 19 insertions, 6 deletions
diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 6f3c8363d..df37064c2 100644
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -59,12 +59,25 @@
settings-file: '{mvn-settings}'
- shell: |
#!/bin/bash
- virtualenv $WORKSPACE/venv-tox
- source $WORKSPACE/venv-tox/bin/activate
- pip install --upgrade pip
- pip install --upgrade tox argparse
- pip freeze
- cd $WORKSPACE/{path}
+ # shellcheck disable=SC1090
+ source ~/lf-env.sh
+
+ lf-activate-venv --python python3.8 --venv-file /tmp/.toxenv \
+ tox tox-pyenv virtualenv
+
+ if [[ -d /opt/pyenv ]]; then
+ echo "---> Setting up pyenv"
+ export PYENV_ROOT="/opt/pyenv"
+ export PATH="$PYENV_ROOT/bin:$PATH"
+ PYTHONPATH="$(pwd)"
+ export PYTHONPATH
+ export TOX_TESTENV_PASSENV=PYTHONPATH
+ fi
+
+ # Useful debugging
+ python --version
+ tox --version
+
tox
publishers: