X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-templates-python.yaml;h=acf99bc8f12f4b76a401a1e95a02bbb6588bc28c;hb=d4cd214f2d27d88f7c00686baaf89a5eea31aee2;hp=80ae84bb775f0eeebed727cbd2567d8329faf624;hpb=8be6e008cc2751aba674780ff1df9be6758708c4;p=ci-management.git

diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 80ae84bb7..acf99bc8f 100644
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -53,23 +53,39 @@
           files: '{pattern}'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           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
+          # shellcheck disable=SC1090
+          source ~/lf-env.sh
+
+          lf-activate-venv --python python3.8 --venv-file /tmp/.toxenv \
+            tox==3.27.1 tox-pyenv virtualenv argparse webtest
+
+          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
+
+          python -m pip install --upgrade pip
+
+          # Useful debugging
+          python --version
+          python -m pip freeze
+          tox --version
+
           cd $WORKSPACE/{path}
           tox
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
+      - lf-infra-publish
 
 - job-template:
     # Job template for docker daily jobs for 3 SCMs
@@ -98,27 +114,11 @@
           artifacts: '{archive-artifacts}'
       - maven-exec:
           maven-version: '{maven-version}'
-
     scm:
       - gerrit-trigger-scm:
           refspec: ''
           choosing-strategy: 'default'
           submodule-recursive: '{submodule-recursive}'
-      - git-extra-project:
-          project: '{extra-project1}'
-          refspec: '{extra-refspec1}'
-          branch: '{extra-branch1}'
-          checkout-dir: '{checkout-dir1}'
-      - git-extra-project:
-          project: '{extra-project2}'
-          refspec: '{extra-refspec2}'
-          branch: '{extra-branch2}'
-          checkout-dir: '{checkout-dir2}'
-      - git-extra-project:
-          project: '{extra-project3}'
-          refspec: '{extra-refspec3}'
-          branch: '{extra-branch3}'
-          checkout-dir: '{checkout-dir3}'
 
     wrappers:
       - infra-wrappers-docker-build:
@@ -137,6 +137,7 @@
           files: '**'
 
     builders:
+      - lf-infra-pre-build
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -144,6 +145,6 @@
           properties-file: version.properties
       - docker-login
       - shell: '{script}'
+
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish