X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-maven-jobs.yaml;h=6112f91a5c32a2c36c55018c9e734f5da671c0fd;hb=ab9889f17775e4716a50ecbe879d8519b56c6976;hp=b1872a15ba5b8f9b05b77e5ae37f02fb17259bf7;hpb=bc24edbf8e3fa80b34c53604c637a66ea76ddf58;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index b1872a15..6112f91a 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -167,14 +167,41 @@
     mvn-opts: ''
     mvn-params: ''
     mvn-version: mvn35
+    nexus-iq-stage: 'build'
     staging-profile-id: ''  # Unused in this job
     stream: master
     submodule-recursive: true
 
+    nexus-iq-scan-patterns:
+      - '**/*.ear'
+      - '**/*.jar'
+      - '**/*.tar.gz'
+      - '**/*.war'
+      - '**/*.zip'
+
     gerrit_clm_triggers:
       - comment-added-contains-event:
           comment-contains-value: run-clm$
 
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          stream: '{stream}'
+          lftools-version: '{lftools-version}'
+      - lf-infra-maven-parameters:
+          mvn-opts: '{mvn-opts}'
+          mvn-params: '{mvn-params}'
+          mvn-version: '{mvn-version}'
+          # Staging repos do not make sense for CLM jobs so set it blank.
+          staging-profile-id: '{staging-profile-id}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+      - lf-clm-parameters:
+          nexus-iq-stage: '{nexus-iq-stage}'
+
     #####################
     # Job Configuration #
     #####################
@@ -192,8 +219,12 @@
           - ../shell/sonatype-clm.sh
       - lf-provide-maven-settings-cleanup
       - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
-      - sonatype-clm:
-          application-name: '{project-name}'
+      - nexus-iq-policy-evaluator:
+          stage: '{nexus-iq-stage}'
+          application-type: 'manual'
+          application-id: '{project-name}'
+          scan-patterns: '{nexus-iq-scan-patterns}'
+          fail-build-network-error: true
 
 - job-template:
     name: '{project-name}-maven-clm-{stream}'
@@ -237,6 +268,8 @@
     <<: *lf_maven_clm
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -352,6 +385,8 @@
     <<: *lf_maven_javadoc_publish
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -410,7 +445,7 @@
           exclude-no-code-change: false
       - draft-published-event
       - comment-added-contains-event:
-          comment-contains-value: recheck$
+          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
 
     #####################
     # Job Configuration #
@@ -466,6 +501,8 @@
     <<: *lf_maven_javadoc_verify
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -480,7 +517,7 @@
 
     triggers:
       - github-pull-request:
-          trigger-phrase: '^recheck$'
+          trigger-phrase: ^(recheck|reverify)$
           only-trigger-phrase: false
           status-context: 'Maven Javadoc Verify'
           permit-all: true
@@ -598,6 +635,8 @@
     <<: *lf_maven_merge
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -714,6 +753,8 @@
     <<: *lf_maven_release
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -864,6 +905,8 @@
     <<: *lf_maven_sonar
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -916,7 +959,8 @@
           exclude-no-code-change: false
       - draft-published-event
       - comment-added-contains-event:
-          comment-contains-value: recheck$
+          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
+
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: '.*'
@@ -987,6 +1031,8 @@
     <<: *lf_maven_verify
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -1001,7 +1047,7 @@
 
     triggers:
       - github-pull-request:
-          trigger-phrase: '^recheck$'
+          trigger-phrase: '^(recheck|reverify)$'
           only-trigger-phrase: false
           status-context: 'Maven Verify'
           permit-all: true