X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-python-jobs.yaml;h=0fdb2a2dbd22a1913f2dd60490f0243b407df0d2;hb=f5172109fc4ca477ad8e4764f41ef03f43fe0956;hp=0c403262a53d62cccb7f8190824589f4320c974c;hpb=69cd0eafa798267b44000ac10b529682a1d84e7a;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index 0c403262..0fdb2a2d 100644
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -77,6 +77,7 @@
     java-version: openjdk8
     nexus-iq-cli-version: 1.44.0-01
     nexus-iq-namespace: "" # Recommend a trailing dash when set. Example: odl-
+    pre-build-script: "# pre-build script goes here"
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
@@ -115,6 +116,7 @@
     builders:
       - lf-update-java-alternatives:
           java-version: "{java-version}"
+      - shell: "{pre-build-script}"
       - lf-infra-clm-python:
           clm-project-name: "{nexus-iq-namespace}{project-name}"
 
@@ -204,9 +206,9 @@
             - "{branch}"
           included-regions: "{obj:github_included_regions}"
 
-########################
+#########################
 # Python Sonar with Tox #
-########################
+#########################
 
 - lf_tox_sonar: &lf_tox_sonar
     name: lf-tox_sonar
@@ -223,10 +225,12 @@
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
     java-version: openjdk8
-    python-version: python2
     mvn-global-settings: global-settings
+    mvn-goals: validate
     mvn-settings: "{mvn-settings}"
     mvn-version: mvn35
+    pre-build-script: "# pre-build script goes here"
+    python-version: python2
     sonar-mvn-goal: "sonar:sonar"
     stream: master
     submodule-recursive: true
@@ -275,34 +279,20 @@
       - lf-infra-pre-build
       - lf-infra-tox-install:
           python-version: "{python-version}"
+      - shell: "{pre-build-script}"
       - shell: !include-raw-escape: ../shell/tox-run.sh
       - lf-provide-maven-settings:
           global-settings-file: "{mvn-global-settings}"
           settings-file: "{mvn-settings}"
-      - lf-infra-tox-sonar:
+      - lf-infra-maven-sonar:
           java-version: "{java-version}"
+          mvn-goals: "{mvn-goals}"
           mvn-settings: "{mvn-settings}"
           mvn-version: "{mvn-version}"
 
     publishers:
       - lf-infra-publish
 
-- builder:
-    name: lf-infra-tox-sonar
-    # Run a Sonar build with Maven
-    builders:
-      - lf-maven-install:
-          mvn-version: "{mvn-version}"
-      - lf-update-java-alternatives:
-          java-version: "{java-version}"
-      - inject:
-          # TODO: Switch this to the sonar wrapper when JJB 2.0 is available
-          properties-content: SONAR_HOST_URL=$SONAR_URL
-      - shell: !include-raw-escape:
-          - ../shell/common-variables.sh
-          - ../shell/maven-sonar.sh
-      - lf-provide-maven-settings-cleanup
-
 - job-template:
     name: "{project-name}-tox-sonar"
     id: gerrit-tox-sonar
@@ -404,6 +394,7 @@
     git-url: "$GIT_URL/$GERRIT_PROJECT"
     github-url: "https://github.com"
     parallel: true
+    pre-build-script: "# pre-build script goes here"
     python-version: python2
     stream: master
     submodule-recursive: true
@@ -455,6 +446,7 @@
       - lf-infra-pre-build
       - lf-infra-tox-install:
           python-version: "{python-version}"
+      - shell: "{pre-build-script}"
       - shell: !include-raw-escape: ../shell/tox-run.sh
 
     publishers: