X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-templates.yaml;h=bdfa06a7123504fa52c1db09a1ecb904bb13b719;hb=cd6b19952cb2c9e464aea0d12371b346a4e1d2f2;hp=a901f463487f4bdcca7bc0528c33793c98e3b6a1;hpb=fa909728ad21b81c4a36e1115d907b4380c66351;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index a901f4634..bdfa06a71 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -4,7 +4,7 @@
     name: 'autorelease-release-{stream}'
 
     project-type: maven
-    node: dynamic_autorelease
+    node: centos7-autorelease-4c-16g
     jdk: '{jdk}'
 
     logrotate:
@@ -12,18 +12,19 @@
         artifactDaysToKeep: '14'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - autorelease-release-tag:
-            release-tag: '{stream}-daily'
+            release-tag: '{next-release-tag}'
         - autorelease-release-branch:
             release-branch: '{branch}'
-        - autorelease-release-datestamp:
-            datestamp: true
 
     scm:
         - git:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'opendaylight-jenkins-ssh'
             url: '$GIT_BASE'
             refspec: ''
             branches:
@@ -31,51 +32,52 @@
             skip-tag: true
             submodule:
                 recursive: true
+                timeout: 60
 
     wrappers:
-        - autorelease-build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '1440'
 
     triggers:
         - timed: 'H 0 * * *'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
+        - wipe-local-maven-repo
         - jacoco-nojava-workaround
+        - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-cfp:
-            autorelease-settings: '{autorelease-settings}'
-            odl-global-settings: '{odl-global-settings}'
+            autorelease-settings: 'autorelease-settings'
+            odl-global-settings: 'odl-global-settings'
         - autorelease-generate-taglist
+        - autorelease-distribute-taglist
         - autorelease-generate-release-patches
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean deploy -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
+        goals: 'clean deploy -V -B -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
         maven-opts: '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-        settings: '{autorelease-settings}'
+        settings: 'autorelease-settings'
         settings-type: cfp
-        global-settings: '{odl-global-settings}'
+        global-settings: 'odl-global-settings'
         global-settings-type: cfp
         automatic-archiving: true
         post-step-run-condition: UNSTABLE
 
     postbuilders:
         - autorelease-maven-deploy
-        - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-get-integration-test-variables
         - autorelease-maven-sources:
             maven-version: '{mvn33}'
-            settings: '{autorelease-settings}'
-            global-settings: '{odl-global-settings}'
+            settings: 'autorelease-settings'
+            global-settings: 'odl-global-settings'
         - autorelease-maven-sources-post-process
         - autorelease-sys-stats
+        - shell: |
+            mkdir -p archives/
+            cp *.log *.prop $_
 
     publishers:
-    - archive-artifacts:
-        artifacts: '*.prop,*.log,patches/*.patch,patches/*.log'
     - email-notification:
         email-prefix: '[autorelease]'
     - trigger-parameterized-builds:
@@ -83,12 +85,14 @@
           condition: UNSTABLE_OR_BETTER
           property-file: variables.prop
           fail-on-missing: true
+    - archive-build:
+        maven-version: '{mvn33}'
 
 - job-template:
     name: 'autorelease-project-report-{stream}'
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -97,8 +101,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - string:
             name: REPORT_DIR
             default: '$WORKSPACE/project-reports'
@@ -106,7 +113,7 @@
 
     scm:
         - git:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'opendaylight-jenkins-ssh'
             url: '$GIT_BASE'
             refspec: ''
             branches:
@@ -116,13 +123,8 @@
                 recursive: true
 
     wrappers:
-        - timeout:
-            type: absolute
-            timeout: 30
-            fail: true
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '30'
 
     triggers:
         - timed: '0 0 * * 0'
@@ -136,8 +138,6 @@
         - autorelease-sys-stats
 
     publishers:
-    - archive-artifacts:
-        artifacts: '*.log,project-reports/*.log'
     - email-ext:
         attachments: 'project-reports/*.log'
         recipients: 'skitt@redhat.com thanh.ha@linuxfoundation.org'
@@ -151,6 +151,8 @@
 
             Archive also available on Jenkins at $BUILD_URL
         always: true
+    - archive-build:
+        maven-version: '{mvn33}'
 
 ###
 ### Maven Sites
@@ -158,7 +160,7 @@
 
 - job-template:
     name: 'autorelease-site-publish-{stream}'
-    node: dynamic_merge
+    node: centos7-java-builder-2c-8g
     concurrent: false
     jdk: 'openjdk8'
 
@@ -173,23 +175,20 @@
         artifactNumToKeep: -1
 
     parameters:
-    - project-parameter:
-        project: '{project}'
-    - gerrit-parameters:
-        project: '{project}'
-        branch: '{branch}'
-        refspec: 'refs/heads/{branch}'
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
     - gerrit-trigger-scm:
-        credentials-id: '{ssh-credentials}'
         refspec: ''
         choosing-strategy: 'default'
 
     wrappers:
-    - ssh-agent-credentials:
-        users:
-        - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
     - autorelease-trigger-patch-site-merged:
@@ -201,9 +200,9 @@
         root-pom: 'site.xml'
         goals: 'site:site site:deploy -Dstream={stream}'
         maven-opts: '-Xmx1024m'
-        settings: '{autorelease-settings}'
+        settings: 'autorelease-settings'
         settings-type: cfp
-        global-settings: '{odl-global-settings}'
+        global-settings: 'odl-global-settings'
         global-settings-type: cfp
 
     publishers:
@@ -212,7 +211,7 @@
 
 - job-template:
     name: 'autorelease-site-verify-{stream}'
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
     jdk: 'openjdk8'
 
@@ -227,23 +226,20 @@
         artifactNumToKeep: -1
 
     parameters:
-    - project-parameter:
-        project: '{project}'
-    - gerrit-parameters:
-        project: '{project}'
-        branch: '{branch}'
-        refspec: 'refs/heads/{branch}'
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
     - gerrit-trigger-scm:
-        credentials-id: '{ssh-credentials}'
         refspec: '$GERRIT_REFSPEC'
         choosing-strategy: 'gerrit'
 
     wrappers:
-    - ssh-agent-credentials:
-        users:
-        - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
     - autorelease-trigger-patch-site-submitted:
@@ -255,9 +251,9 @@
         root-pom: 'site.xml'
         goals: 'site:site -Dstream={stream}'
         maven-opts: '-Xmx1024m'
-        settings: '{autorelease-settings}'
+        settings: 'autorelease-settings'
         settings-type: cfp
-        global-settings: '{odl-global-settings}'
+        global-settings: 'odl-global-settings'
         global-settings-type: cfp
 
     publishers: