Merge "Don't allow retry to fail stacking"

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 3dfe884835470c2a48da3a18dcbc9745cbbf665f..94141d55285bbd6b8745669e645b931e19a8d9b1 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -7,7 +7,7 @@
     # Defaults #
     ############
 
-    build-node: centos7-autorelease-8c-16g
+    build-node: '{build-node}'
     java-version: openjdk8
     mvn-version: mvn33
     extra-mvn-opts: ''
@@ -154,7 +154,7 @@
 - job-template:
     name: autorelease-update-validate-jobs-{stream}
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - lf-infra-properties:
@@ -199,8 +199,7 @@
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     builders:
-      - shell: !include-raw-escape:
-          - update-validate-autorelease-projects.sh
+      - autorelease-update-validate-projects
       - opendaylight-infra-push-gerrit-patch:
           project: 'releng/builder'
           gerrit-topic: 'autorelease-update-validate-jobs-{stream}'
@@ -213,7 +212,7 @@
 - job-template:
     name: autorelease-version-bump-{stream}
     project-type: freestyle
-    node: centos7-builder-4c-16g
+    node: '{build-node}'
 
     properties:
       - opendaylight-infra-properties:
@@ -349,7 +348,9 @@
 
     disabled: false
     project-type: freestyle
-    node: '{build-node}'
+    # Note: This NEEDS to be hardcoded as projects should NOT be allowed to
+    #       override the build node.
+    node: centos7-builder-2c-8g
     concurrent: true
     jdk: '{java-version}'