X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-python-jobs.yaml;h=e07810caf1846c1740bfd4faf2a30b32ef0a4d0e;hb=fc00439357256a05f1b56220c64eee0acb81315f;hp=4011822f6bb8d4222c046ce3927f859e6728c9de;hpb=bd303903ee1d12dd5618106b1dad1f7b0a41983a;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml index 4011822f..e07810ca 100644 --- a/jjb/lf-python-jobs.yaml +++ b/jjb/lf-python-jobs.yaml @@ -17,6 +17,17 @@ jobs: - github-tox-verify +########## +# Macros # +########## + +- builder: + name: lf-infra-tox-install + builders: + - inject: + properties-content: 'PYTHON_VERSION={python-version}' + - shell: !include-raw-escape: ../shell/tox-install.sh + ############## # Tox Verify # ############## @@ -30,8 +41,9 @@ branch: master build-days-to-keep: 7 - build-timeout: 10 + build-timeout: 15 git-url: '$GIT_URL/$GERRIT_PROJECT' + python-version: python2 stream: master submodule-recursive: true tox-dir: '' @@ -70,9 +82,9 @@ # 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