X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-whitesource-jobs.yaml;h=77434a875ce1adf3eca414dd92eee538f44aa4f3;hb=f88c7c24b2b1a6f04f85afa8c0a91d8321aef8ea;hp=7dc5d5070f77eeecfa90fda08b72b6f23fe84655;hpb=76ee13a174ec2e94048d17f3dd1c5d0355518bf5;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-whitesource-jobs.yaml b/jjb/lf-whitesource-jobs.yaml
index 7dc5d507..77434a87 100644
--- a/jjb/lf-whitesource-jobs.yaml
+++ b/jjb/lf-whitesource-jobs.yaml
@@ -4,6 +4,22 @@
 # Macros #
 ##########
 
+- builder:
+    name: lf-infra-wss-mvn-clean-install
+    builders:
+      - conditional-step:
+          condition-kind: boolean-expression
+          condition-expression: '{mvn-clean-install}'
+          steps:
+            - maven-target:
+                maven-version: '{mvn-version}'
+                pom: '{mvn-pom}'
+                goals: 'clean install'
+                settings: '{mvn-settings}'
+                settings-type: cfp
+                global-settings: 'global-settings'
+                global-settings-type: cfp
+
 - builder:
     name: lf-infra-wss-unified-agent-scan
     builders:
@@ -76,9 +92,14 @@
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     java-version: openjdk8
+    mvn-clean-install: false
+    mvn-global-settings: global-settings
+    mvn-pom: ''
+    mvn-version: mvn35
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
+    submodule-disable: false
     wss-unified-agent-opts: ''
     wss-unified-agent-version: 19.2.2.2
 
@@ -122,6 +143,11 @@
       - lf-infra-pre-build
       - lf-update-java-alternatives:
           java-version: '{java-version}'
+      - lf-infra-wss-mvn-clean-install:
+          mvn-clean-install: '{mvn-clean-install}'
+          mvn-version: '{mvn-version}'
+          mvn-pom: '{mvn-pom}'
+          mvn-settings: '{mvn-settings}'
       - lf-infra-wss-unified-agent-scan
 
 - job-template:
@@ -137,7 +163,7 @@
 
     gerrit_wss_triggers:
       - comment-added-contains-event:
-          comment-contains-value: run-whitesource$
+          comment-contains-value: '^Patch Set\s+\d+:\s+(run-whitesource)\s*$'
 
     #####################
     # Job Configuration #
@@ -151,6 +177,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     triggers:
@@ -192,6 +219,7 @@
           branch: 'refs/heads/{branch}'
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'