Update automated project templates

[releng/builder.git] / jjb / persistence / persistence.yaml

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index ced76ce9c5e427638228f2f487d2308c899cc2be..b784b18323d07148fea95e28bf83dc71b87d8aff 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -87,9 +87,9 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: '{branch}'
-        - gerrit-refspec-parameter:
             refspec: 'refs/heads/{branch}'
 
     scm:
@@ -157,9 +157,9 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: '{branch}'
-        - gerrit-refspec-parameter:
             refspec: 'refs/heads/{branch}'
 
     scm:
@@ -313,7 +313,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge
+    node: dynamic_merge_8g
     jdk: '{jdk}'
 
     logrotate:
@@ -375,7 +375,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify
+    node: dynamic_verify_8g
     concurrent: true
     jdk: '{jdk}'
 
@@ -386,10 +386,10 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - gerrit-project-parameter:
+        - gerrit-parameters:
             project: '{project}'
-        - gerrit-refspec-parameter:
-            refspec: '{branch}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
         - project-parameter:
             project: '{project}'
         - integration-distribution-git-url
@@ -672,14 +672,14 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
         - autorelease-release-tag:
             release-tag: 'validate'
         - autorelease-release-branch:
             release-branch: '{branch}'
-        - autorelease-release-datestamp:
-            datestamp: true
         - string:
             name: CLONE_URL
             default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/releng/autorelease'
@@ -694,7 +694,6 @@
             skip-tag: true
             submodule:
                 recursive: true
-                timeout: 15
 
     wrappers:
         - autorelease-build-timeout