Merge changes from topic 'RELENG-704'

[releng/builder.git] / jjb / autorelease / autorelease-templates.yaml

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index a34404c4eb01f9104ac74e27f04ef2703507f747..37e0c02b2db82251645ac29ed669be8b7015fc36 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -3,15 +3,23 @@
 - job-template:
     name: 'autorelease-release-{stream}'
 
-    project-type: freestyle
-    node: centos7-autorelease-4c-16g
-    jdk: '{jdk}'
-    cron: 'H 0 * * *'
+    ############
+    # Defaults #
+    ############
 
-    # Default variable values
+    java-version: openjdk8
     mvn-version: mvn33
     extra-mvn-opts: ''
 
+    #####################
+    # Job Configuration #
+    #####################
+
+    project-type: freestyle
+    node: centos7-autorelease-4c-16g
+    jdk: '{java-version}'
+    cron: 'H 0 * * *'
+
     properties:
       - lf-infra-properties:
           build-days-to-keep: 30
@@ -145,7 +153,7 @@
 - job-template:
     name: autorelease-update-validate-jobs-{stream}
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-1c-4g
 
     properties:
       - lf-infra-properties:
@@ -278,7 +286,7 @@
     #####################
 
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-1c-4g
 
     properties:
       - lf-infra-properties:
@@ -327,12 +335,22 @@
 
 - job-template:
     name: '{project-name}-validate-autorelease-{stream}'
-    disabled: false
 
+    ############
+    # Defaults #
+    ############
+
+    java-version: openjdk8
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    disabled: false
     project-type: freestyle
     node: '{build-node}'
     concurrent: true
-    jdk: openjdk8
+    jdk: '{java-version}'
 
     properties:
       - lf-infra-properties:
@@ -369,7 +387,7 @@
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**/*.xml'