From: Thanh Ha Date: Fri, 14 Sep 2018 01:31:49 +0000 (-0400) Subject: Update tox-sonar job to use lf-infra-pre-build X-Git-Tag: v0.24.3~1 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;ds=sidebyside;h=7265d1f18e9895a1d86449c3ee9fa57edd023df9;p=releng%2Fglobal-jjb.git Update tox-sonar job to use lf-infra-pre-build Use lf-infra-pre-build to install lftools via --user config. This resolves the post-build install failing with missing pip==18.0. This is related to the lftools-venv series of patches. Change-Id: I3c0320ada2e6ede3ce6b680ee26aa2a0b74e5e6d Signed-off-by: Thanh Ha --- diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml index 2de5d8b0..dbd09441 100644 --- a/jjb/lf-python-jobs.yaml +++ b/jjb/lf-python-jobs.yaml @@ -286,11 +286,7 @@ can call "org.codehaus.mojo:sonar-maven-plugin:3.3.0.603:sonar". builders: - - shell: !include-raw-escape: - # Workaround issue where the tox run later breaks the lftools virtualenv. - # 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 + - lf-infra-pre-build - lf-infra-tox-install: python-version: '{python-version}' - shell: !include-raw-escape: ../shell/tox-run.sh