X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-maven-jobs.yaml;h=ca94823431e4ebb449ce5ca598ec8707acff5ede;hb=refs%2Fchanges%2F94%2F10394%2F1;hp=47c25556bc99088abe7ee39d5d28e0169b988558;hpb=25d3bb45eaf1e25522b680cac541416a59e65085;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 47c25556..ca948234 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -10,6 +10,7 @@
     # TODO: Add Maven Merge job to this list once it's been fully tested.
     jobs:
       - gerrit-maven-clm
+      - gerrit-maven-merge
       - gerrit-maven-release
       - gerrit-maven-verify
       - gerrit-maven-verify-dependencies
@@ -23,6 +24,7 @@
     # TODO: Add Maven Merge job to this list once it's been fully tested.
     jobs:
       - github-maven-clm
+      - github-maven-merge
       - github-maven-release
       - github-maven-verify
 
@@ -46,6 +48,47 @@
       - github-maven-javadoc-publish
       - github-maven-javadoc-verify
 
+##########
+# Macros #
+##########
+
+- builder:
+    name: lf-maven-build
+    builders:
+      - inject:
+          properties-content: 'MAVEN_GOALS={mvn-goals}'
+      - shell: !include-raw-escape:
+          - ../shell/common-variables.sh
+          - ../shell/maven-build.sh
+
+- builder:
+    name: lf-maven-deploy
+    builders:
+      - shell: !include-raw:
+          - ../shell/common-variables.sh
+          - ../shell/maven-deploy.sh
+
+- builder:
+    name: lf-maven-stage
+    builders:
+      # include-raw-escape fails due to JJB bug
+      - shell: !include-raw:
+          - ../shell/common-variables.sh
+          - ../shell/maven-stage.sh
+
+- builder:
+    name: lf-update-java-alternatives
+    builders:
+      - inject:
+          # Work around inject plugin overriding our GIT_URL variable incorrectly
+          # https://issues.jenkins-ci.org/browse/JENKINS-49775
+          properties-content: |
+            SET_JDK_VERSION={java-version}
+            GIT_URL="$GIT_URL"
+      - shell: !include-raw-escape: ../shell/update-java-alternatives.sh
+      - inject:
+          properties-file: '/tmp/java.env'
+
 ####################
 # COMMON FUNCTIONS #
 ####################
@@ -53,9 +96,23 @@
 - lf_maven_common: &lf_maven_common
     name: lf-maven-common
 
+    ######################
+    # Default parameters #
+    ######################
+
+    archive-artifacts: >
+      **/*.log
+      **/hs_err_*.log
+      **/target/**/feature.xml
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/target/surefire-reports/*-output.txt
+
+    #####################
+    # Job Configuration #
+    #####################
+
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{java-version}'
 
     properties:
       - lf-infra-properties:
@@ -101,16 +158,15 @@
     # Default parameters #
     ######################
 
-    archive-artifacts: ''
     branch: master
     build-days-to-keep: 30  # 30 days for troubleshooting purposes
-    build-timeout: 30
+    build-timeout: 60
     git-url: '$GIT_URL/$PROJECT'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-opts: ''
     mvn-params: ''
-    mvn-version: mvn33
+    mvn-version: mvn35
     staging-profile-id: ''  # Unused in this job
     stream: master
     submodule-recursive: true
@@ -144,6 +200,8 @@
     builders:
       - lf-maven-install:
           mvn-version: '{mvn-version}'
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
@@ -215,16 +273,15 @@
     # Default parameters #
     ######################
 
-    archive-artifacts: ''
     branch: master
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
-    build-timeout: 30
+    build-timeout: 60
     git-url: '$GIT_URL/$PROJECT'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-opts: ''
     mvn-params: ''
-    mvn-version: mvn33
+    mvn-version: mvn35
     staging-profile-id: ''  # Unused by the javadoc jobs
     stream: master
     submodule-recursive: true
@@ -241,6 +298,8 @@
     builders:
       - lf-maven-install:
           mvn-version: '{mvn-version}'
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
@@ -329,16 +388,15 @@
     # Default parameters #
     ######################
 
-    archive-artifacts: ''
     branch: master
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
-    build-timeout: 30
+    build-timeout: 60
     git-url: '$GIT_URL/$PROJECT'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-opts: ''
     mvn-params: ''
-    mvn-version: mvn33
+    mvn-version: mvn35
     staging-profile-id: ''  # Unused by the javadoc jobs
     stream: master
     submodule-recursive: true
@@ -361,6 +419,8 @@
     builders:
       - lf-maven-install:
           mvn-version: '{mvn-version}'
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
@@ -440,17 +500,17 @@
     # Default parameters #
     ######################
 
-    archive-artifacts: ''
     branch: master
     build-days-to-keep: 30  # 30 days in case we need to troubleshoot
-    build-timeout: 30
-    cron: ''
+    build-timeout: 60
+    cron: 'H H * * 0'  # push fresh snapshot weekly
     git-url: '$GIT_URL/$PROJECT'
     java-version: openjdk8
     mvn-global-settings: global-settings
+    mvn-goals: clean deploy
     mvn-opts: ''
     mvn-params: '-Dmerge'
-    mvn-version: mvn33
+    mvn-version: mvn35
     nexus-cut-dirs: 6  # Number of dirs in the Nexus path to remove for wget -r.
     staging-profile-id: ''  # Unused by this job.
     stream: master
@@ -475,6 +535,8 @@
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
           mvn-version: '{mvn-version}'
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
@@ -486,10 +548,10 @@
               NEXUS_REPO={nexus-snapshot-repo}
       - shell: !include-raw-escape:
           - ../shell/lftools-install.sh
-          - ../shell/common-variables.sh
           - ../shell/maven-fetch-metadata.sh
-          - ../shell/maven-build.sh
-          - ../shell/maven-deploy.sh
+      - lf-maven-build:
+          mvn-goals: '{mvn-goals}'
+      - lf-maven-deploy
       - lf-provide-maven-settings-cleanup
 
     publishers:
@@ -515,7 +577,7 @@
           choosing-strategy: default
 
     triggers:
-      - timed: 'H H * * 0'
+      - timed: '{obj:cron}'
       - gerrit:
           server-name: '{gerrit-server-name}'
           trigger-on: '{obj:gerrit_merge_triggers}'
@@ -571,17 +633,17 @@
     # Default parameters #
     ######################
 
-    archive-artifacts: ''
     branch: master
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
-    build-timeout: 30
+    build-timeout: 60
     cron: ''
     git-url: '$GIT_URL/$PROJECT'
     java-version: openjdk8
     mvn-global-settings: global-settings
+    mvn-goals: clean deploy
     mvn-opts: ''
     mvn-params: ''
-    mvn-version: mvn33
+    mvn-version: mvn35
     stream: master
     submodule-recursive: true
 
@@ -597,6 +659,8 @@
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
           mvn-version: '{mvn-version}'
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
@@ -604,10 +668,10 @@
           server-id: '{mvn-staging-id}'
       - shell: !include-raw-escape:
           - ../shell/lftools-install.sh
-          - ../shell/common-variables.sh
           - ../shell/maven-patch-release.sh
-          - ../shell/maven-build.sh
-          - ../shell/maven-stage.sh
+      - lf-maven-build:
+          mvn-goals: '{mvn-goals}'
+      - lf-maven-stage
       - lf-provide-maven-settings-cleanup
 
 - job-template:
@@ -683,16 +747,16 @@
     # Default parameters #
     ######################
 
-    archive-artifacts: ''
     branch: master  # Sonar should always be run on master branch
     build-days-to-keep: 7
-    build-timeout: 30
+    build-timeout: 60
+    cron: 'H H * * 6'  # run weekly
     git-url: '$GIT_URL/$PROJECT'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-opts: ''
     mvn-params: ''
-    mvn-version: mvn33
+    mvn-version: mvn35
     sonar-mvn-goal: 'sonar:sonar'
     staging-profile-id: ''  # Unused in this job
     stream: master
@@ -731,7 +795,7 @@
               can call "org.codehaus.mojo:sonar-maven-plugin:3.3.0.603:sonar".
 
     triggers:
-      - timed: 'H H * * 6'
+      - timed: '{obj:cron}'
       - gerrit:
           server-name: '{gerrit-server-name}'
           trigger-on: '{obj:gerrit_sonar_triggers}'
@@ -749,6 +813,7 @@
 
     builders:
       - lf-infra-maven-sonar:
+          java-version: '{java-version}'
           mvn-settings: '{mvn-settings}'
           mvn-version: '{mvn-version}'
 
@@ -763,6 +828,8 @@
     builders:
       - lf-maven-install:
           mvn-version: '{mvn-version}'
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - inject:
           # Switch this to the sonar wrapper when JJB 2.0 is available
           properties-content: SONAR_HOST_URL=$SONAR_URL
@@ -834,16 +901,16 @@
     # Default parameters #
     ######################
 
-    archive-artifacts: ''
     branch: master
     build-days-to-keep: 7
     build-timeout: 60
     git-url: '$GIT_URL/$PROJECT'
     java-version: openjdk8
     mvn-global-settings: global-settings
+    mvn-goals: clean deploy
     mvn-opts: ''
     mvn-params: '-Dstream=$STREAM'
-    mvn-version: mvn33
+    mvn-version: mvn35
     staging-profile-id: ''  # Unused in this job
     stream: master
     submodule-recursive: true
@@ -870,13 +937,15 @@
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
           mvn-version: '{mvn-version}'
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
       - shell: !include-raw-escape:
           - ../shell/lftools-install.sh
-          - ../shell/common-variables.sh
-          - ../shell/maven-build.sh
+      - lf-maven-build:
+          mvn-goals: '{mvn-goals}'
       - lf-provide-maven-settings-cleanup
 
     publishers:
@@ -956,16 +1025,16 @@
     # Default parameters #
     ######################
 
-    archive-artifacts: ''
     branch: master
     build-days-to-keep: 7
     build-timeout: 60
     git-url: '$GIT_URL/$PROJECT'
     java-version: openjdk8
     mvn-global-settings: global-settings
+    mvn-goals: clean deploy
     mvn-opts: ''
     mvn-params: '-Dstream=$STREAM'
-    mvn-version: mvn33
+    mvn-version: mvn35
     staging-profile-id: ''  # Unused by this job
     stream: master
     submodule-recursive: true
@@ -987,6 +1056,8 @@
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
           mvn-version: '{mvn-version}'
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
@@ -994,9 +1065,8 @@
       - shell: !include-raw-escape:
           - ../shell/common-variables.sh
           - ../shell/maven-build-deps.sh
-      - shell: !include-raw-escape:
-          - ../shell/common-variables.sh
-          - ../shell/maven-build.sh
+      - lf-maven-build:
+          mvn-goals: '{mvn-goals}'
       - lf-provide-maven-settings-cleanup
 
     publishers: