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 d868d9e1e79ad706073ba7eea6f0e503d2048c0d..94141d55285bbd6b8745669e645b931e19a8d9b1 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -7,6 +7,7 @@
     # Defaults #
     ############
 
+    build-node: '{build-node}'
     java-version: openjdk8
     mvn-version: mvn33
     extra-mvn-opts: ''
@@ -16,7 +17,7 @@
     #####################
 
     project-type: freestyle
-    node: centos7-builder-4c-16g
+    node: '{build-node}'
     jdk: '{java-version}'
     cron: 'H 0 * * *'
 
@@ -153,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:
@@ -198,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}'
@@ -212,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:
@@ -348,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}'
 
@@ -417,6 +419,8 @@
           settings-type: cfp
           global-settings: global-settings
           global-settings-type: cfp
+      # Hack to workaround the duplicate-finder plugin in odlparent breaking validate-autorelease
+      - shell: sed -i 's/validate/none/' /tmp/r/org/opendaylight/odlparent/odlparent/3.0.2/odlparent-3.0.2.pom
       - maven-target:
           maven-version: mvn33
           pom: pom.xml