X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-maven-jobs.yaml;h=f127e91ced86c2dda1ea0d2cb0906d4b8bafe3aa;hb=fc00439357256a05f1b56220c64eee0acb81315f;hp=8b3f3ace3a0eb78ff64d64da6a99297744e03ec5;hpb=ac158d4c6fe40b2f159b11abb6d3f51bd32c4651;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 8b3f3ace..f127e91c 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -48,6 +48,42 @@
       - 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:
+      - shell: !include-raw-escape:
+          - ../shell/common-variables.sh
+          - ../shell/maven-stage.sh
+
+- builder:
+    name: lf-update-java-alternatives
+    builders:
+      - inject:
+          properties-content: 'SET_JDK_VERSION={java-version}'
+      - shell: !include-raw-escape: ../shell/update-java-alternatives.sh
+      - inject:
+          properties-file: '/tmp/java.env'
+
 ####################
 # COMMON FUNCTIONS #
 ####################
@@ -72,7 +108,6 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{java-version}'
 
     properties:
       - lf-infra-properties:
@@ -120,7 +155,7 @@
 
     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
@@ -160,6 +195,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}'
@@ -233,7 +270,7 @@
 
     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
@@ -256,6 +293,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}'
@@ -346,7 +385,7 @@
 
     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
@@ -375,6 +414,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}'
@@ -456,11 +497,12 @@
 
     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
@@ -488,6 +530,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}'
@@ -499,10 +543,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:
@@ -528,7 +572,7 @@
           choosing-strategy: default
 
     triggers:
-      - timed: 'H H * * 0'
+      - timed: '{obj:cron}'
       - gerrit:
           server-name: '{gerrit-server-name}'
           trigger-on: '{obj:gerrit_merge_triggers}'
@@ -586,11 +630,12 @@
 
     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
@@ -609,6 +654,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}'
@@ -616,10 +663,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:
@@ -697,7 +744,8 @@
 
     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
@@ -742,7 +790,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}'
@@ -760,6 +808,7 @@
 
     builders:
       - lf-infra-maven-sonar:
+          java-version: '{java-version}'
           mvn-settings: '{mvn-settings}'
           mvn-version: '{mvn-version}'
 
@@ -774,6 +823,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
@@ -851,6 +902,7 @@
     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
@@ -880,13 +932,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:
@@ -972,6 +1026,7 @@
     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
@@ -996,6 +1051,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}'
@@ -1003,9 +1060,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: