X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-maven-jobs.yaml;h=77f34de66bbda9d5481fc6c96cbafcbee75c85c2;hb=89213a114af3775da43b5f97c3584db516d49987;hp=4b4ad8e7868f0a745a74b95a757473bdd73b3239;hpb=227dc247632240097740bf3cfece2829bfd3cf14;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 4b4ad8e7..77f34de6 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -142,6 +142,7 @@
     github-url: "https://github.com"
     java-version: openjdk8
     mvn-global-settings: global-settings
+    mvn-goals: clean install
     mvn-opts: ""
     mvn-params: ""
     mvn-version: mvn35
@@ -194,9 +195,8 @@
       - lf-provide-maven-settings:
           global-settings-file: "{mvn-global-settings}"
           settings-file: "{mvn-settings}"
-      - shell: !include-raw-escape:
-          - ../shell/common-variables.sh
-          - ../shell/sonatype-clm.sh
+      - lf-infra-sonatype-clm:
+          mvn-goals: "{mvn-goals}"
       - lf-provide-maven-settings-cleanup
       - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
       - nexus-iq-policy-evaluator:
@@ -206,6 +206,17 @@
           scan-patterns: "{obj:nexus_iq_scan_patterns}"
           fail-build-network-error: true
 
+- builder:
+    name: lf-infra-sonatype-clm
+    # Run a CLM scan build with Maven
+    builders:
+      - inject:
+          properties-content: |
+            MAVEN_GOALS={mvn-goals}
+      - shell: !include-raw-escape:
+          - ../shell/common-variables.sh
+          - ../shell/sonatype-clm.sh
+
 - job-template:
     name: "{project-name}-maven-clm-{stream}"
     id: gerrit-maven-clm
@@ -300,6 +311,7 @@
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
     java-version: openjdk8
+    mvn-dir: "."
     mvn-global-settings: global-settings
     mvn-opts: ""
     mvn-params: ""
@@ -332,7 +344,9 @@
       - lf-infra-create-netrc:
           server-id: "{mvn-site-id}"
       - inject:
-          properties-content: "DEPLOY_PATH={javadoc-path}"
+          properties-content: |
+            DEPLOY_PATH={javadoc-path}
+            MAVEN_DIR={mvn-dir}
       - shell: !include-raw-escape:
           - ../shell/common-variables.sh
           - ../shell/maven-javadoc-generate.sh
@@ -429,6 +443,7 @@
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
     java-version: openjdk8
+    mvn-dir: "."
     mvn-global-settings: global-settings
     mvn-opts: ""
     mvn-params: ""
@@ -463,6 +478,9 @@
       - lf-provide-maven-settings:
           global-settings-file: "{mvn-global-settings}"
           settings-file: "{mvn-settings}"
+      - inject:
+          properties-content: |
+            MAVEN_DIR={mvn-dir}
       - shell: !include-raw-escape:
           - ../shell/common-variables.sh
           - ../shell/maven-javadoc-generate.sh
@@ -833,7 +851,7 @@
 
     gerrit_release_triggers:
       - comment-added-contains-event:
-          comment-contains-value: '^Patch Set\s+\d+:\s+stage-release\s*$'
+          comment-contains-value: '^Patch Set\s+\d+:\s+stage-(maven-)?release\s*$'
 
     gerrit_trigger_file_paths:
       - compare-type: ANT
@@ -964,7 +982,7 @@
     triggers:
       - timed: "{obj:cron}"
       - github-pull-request:
-          trigger-phrase: "^build release$"
+          trigger-phrase: "^stage-(maven-)?release$"
           only-trigger-phrase: true
           status-context: "Maven Release"
           permit-all: true
@@ -1015,6 +1033,10 @@
       # NO lf-maven-central
       - lf-provide-maven-settings-cleanup
 
+    gerrit_release_docker_triggers:
+      - comment-added-contains-event:
+          comment-contains-value: '^Patch Set\s+\d+:\s+stage-(docker-)?release\s*$'
+
 - job-template:
     name: "{project-name}-maven-docker-stage-{stream}"
     id: gerrit-maven-docker-stage
@@ -1039,7 +1061,7 @@
       - timed: "{obj:cron}"
       - gerrit:
           server-name: "{gerrit-server-name}"
-          trigger-on: "{obj:gerrit_release_triggers}"
+          trigger-on: "{obj:gerrit_release_docker_triggers}"
           projects:
             - project-compare-type: ANT
               project-pattern: "{project}"
@@ -1077,7 +1099,7 @@
     triggers:
       - timed: "{obj:cron}"
       - github-pull-request:
-          trigger-phrase: "^build release$"
+          trigger-phrase: "^stage-(docker-)?release$"
           only-trigger-phrase: true
           status-context: "Maven Release"
           permit-all: true
@@ -1105,6 +1127,7 @@
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
     java-version: openjdk8
+    java-opts: ""
     mvn-global-settings: global-settings
     mvn-goals: clean install
     mvn-opts: ""
@@ -1143,6 +1166,11 @@
           name: ARCHIVE_ARTIFACTS
           default: "{archive-artifacts}"
           description: Artifacts to archive to the logs server.
+      - string:
+          name: JAVA_OPTS
+          default: "{java-opts}"
+          description: |
+            Java options. Example: -Xmx1024m
       - string:
           name: SONAR_MAVEN_GOAL
           default: "{sonar-mvn-goal}"