Remove jdk variable from lf-maven-jobs

[releng/global-jjb.git] / jjb / lf-maven-jobs.yaml

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 8b3f3ac..988eebd 100644 (file)
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -48,6 +48,17 @@
       - 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
+
 ####################
 # COMMON FUNCTIONS #
 ####################
@@ -72,7 +83,6 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{java-version}'
 
     properties:
       - lf-infra-properties:
@@ -120,7 +130,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
@@ -233,7 +243,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
@@ -346,7 +356,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
@@ -456,8 +466,8 @@
 
     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
@@ -502,7 +512,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 +538,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,7 +596,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
     cron: ''
     git-url: '$GIT_URL/$PROJECT'
     java-version: openjdk8
@@ -697,7 +707,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 +753,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}'