X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-python-jobs.yaml;h=e07810caf1846c1740bfd4faf2a30b32ef0a4d0e;hb=d33f3cbda58449a245ab383cc566f11429d5f079;hp=7f7fb50f08b45561288f6cd64f788ace421d1e3e;hpb=c9d4074e828ab8d5a8455bc43059f6584708c76c;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index 7f7fb50f..e07810ca 100644
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -17,29 +17,33 @@
     jobs:
       - github-tox-verify
 
-####################
-# Anchors & Macros #
-####################
+##########
+# Macros #
+##########
 
-- lf_tox_verify: &lf_tox_verify
-    name: lf-tox-verify
+- builder:
+    name: lf-infra-tox-install
+    builders:
+      - inject:
+          properties-content: 'PYTHON_VERSION={python-version}'
+      - shell: !include-raw-escape: ../shell/tox-install.sh
 
-    # Required Variables:
-    #     branch:    git branch (default: master)
-    #     tox-dir:   directory containing the project's tox.ini relative to
-    #                the workspace. Empty works if tox.ini is at project root.
+##############
+# Tox Verify #
+##############
 
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
+- lf_tox_verify: &lf_tox_verify
+    name: lf-tox-verify
 
     ######################
     # Default parameters #
     ######################
 
     branch: master
-    build-timeout: 10
+    build-days-to-keep: 7
+    build-timeout: 15
     git-url: '$GIT_URL/$GERRIT_PROJECT'
+    python-version: python2
     stream: master
     submodule-recursive: true
     tox-dir: ''
@@ -49,15 +53,20 @@
     # Job Configuration #
     #####################
 
+    project-type: freestyle
+    node: '{build-node}'
+    concurrent: true
+
     properties:
       - lf-infra-properties:
-          build-days-to-keep: 7
+          build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
       - lf-infra-parameters:
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
+          lftools-version: '{lftools-version}'
       - lf-infra-tox-parameters:
           tox-dir: '{tox-dir}'
           tox-envs: '{tox-envs}'
@@ -73,17 +82,13 @@
           # Without running the install first the run in the publisher will fail
           # due to missing lftools because it gets installed into a tox venv.
           - ../shell/lftools-install.sh
-      - shell: !include-raw-escape:
-          - ../shell/tox-install.sh
-          - ../shell/tox-run.sh
+      - lf-infra-tox-install:
+          python-version: '{python-version}'
+      - shell: !include-raw-escape: ../shell/tox-run.sh
 
     publishers:
       - lf-infra-publish
 
-#################
-# Job Templates #
-#################
-
 - job-template:
     # Python projects typically use tox to run testing.
     name: '{project-name}-tox-verify-{stream}'
@@ -96,7 +101,7 @@
 
     gerrit_verify_triggers:
       - patchset-created-event:
-          exclude-drafts: false
+          exclude-drafts: true
           exclude-trivial-rebase: false
           exclude-no-code-change: false
       - draft-published-event
@@ -141,7 +146,7 @@
       - lf-infra-github-scm:
           url: '{git-clone-url}{github-org}/{project}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '{branch}'
+          branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'