X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-maven-jobs.yaml;h=9f7173abe24d1923d3cd94067382deb172ec250d;hb=refs%2Fchanges%2F37%2F8437%2F2;hp=26451a457ec93483a1b368ee90d3bcfc34f361a5;hpb=a5a5237ab810ab8ad4ff61731f9f8bdc1e1e342e;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 26451a45..9f7173ab 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -48,6 +48,33 @@
       - github-maven-javadoc-publish
       - github-maven-javadoc-verify
 
+##########
+# Macros #
+##########
+
+- 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 +99,6 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{java-version}'
 
     properties:
       - lf-infra-properties:
@@ -160,6 +186,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}'
@@ -256,6 +284,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}'
@@ -375,6 +405,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}'
@@ -457,7 +489,7 @@
     branch: master
     build-days-to-keep: 30  # 30 days in case we need to troubleshoot
     build-timeout: 60
-    cron: ''
+    cron: 'H H * * 0'  # push fresh snapshot weekly
     git-url: '$GIT_URL/$PROJECT'
     java-version: openjdk8
     mvn-global-settings: global-settings
@@ -488,6 +520,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}'
@@ -502,7 +536,7 @@
           - ../shell/common-variables.sh
           - ../shell/maven-fetch-metadata.sh
           - ../shell/maven-build.sh
-          - ../shell/maven-deploy.sh
+      - lf-maven-deploy
       - lf-provide-maven-settings-cleanup
 
     publishers:
@@ -528,7 +562,7 @@
           choosing-strategy: default
 
     triggers:
-      - timed: 'H H * * 0'
+      - timed: '{obj:cron}'
       - gerrit:
           server-name: '{gerrit-server-name}'
           trigger-on: '{obj:gerrit_merge_triggers}'
@@ -609,6 +643,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}'
@@ -619,7 +655,7 @@
           - ../shell/common-variables.sh
           - ../shell/maven-patch-release.sh
           - ../shell/maven-build.sh
-          - ../shell/maven-stage.sh
+      - lf-maven-stage
       - lf-provide-maven-settings-cleanup
 
 - job-template:
@@ -698,6 +734,7 @@
     branch: master  # Sonar should always be run on master branch
     build-days-to-keep: 7
     build-timeout: 60
+    cron: 'H H * * 6'  # run weekly
     git-url: '$GIT_URL/$PROJECT'
     java-version: openjdk8
     mvn-global-settings: global-settings
@@ -742,7 +779,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 +797,7 @@
 
     builders:
       - lf-infra-maven-sonar:
+          java-version: '{java-version}'
           mvn-settings: '{mvn-settings}'
           mvn-version: '{mvn-version}'
 
@@ -774,6 +812,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
@@ -880,6 +920,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}'
@@ -996,6 +1038,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}'