Rename archive-build macro to opendaylight-infra-shiplogs

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index ec0bbeea44dbee9db0edfc45e25908a396adabd6..6a5e9f82337ba03fd1d728b435d1ef9f4eee1cc3 100644 (file)
--- 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,8 +12,11 @@
         artifactDaysToKeep: '14'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - autorelease-release-tag:
             release-tag: '{next-release-tag}'
         - autorelease-release-branch:
@@ -41,6 +44,7 @@
     prebuilders:
         - 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'
@@ -62,7 +66,6 @@
 
     postbuilders:
         - autorelease-maven-deploy
-        - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-get-integration-test-variables
         - autorelease-maven-sources:
             maven-version: '{mvn33}'
@@ -70,10 +73,11 @@
             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/*.bundle,patches/*.patch,patches/*.log'
     - email-notification:
         email-prefix: '[autorelease]'
     - trigger-parameterized-builds:
@@ -81,12 +85,14 @@
           condition: UNSTABLE_OR_BETTER
           property-file: variables.prop
           fail-on-missing: true
+    - opendaylight-infra-shiplogs:
+        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}'
@@ -95,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'
@@ -129,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'
@@ -144,6 +151,8 @@
 
             Archive also available on Jenkins at $BUILD_URL
         always: true
+    - opendaylight-infra-shiplogs:
+        maven-version: '{mvn33}'
 
 ###
 ### Maven Sites
@@ -151,7 +160,7 @@
 
 - job-template:
     name: 'autorelease-site-publish-{stream}'
-    node: dynamic_merge
+    node: centos7-java-builder-2c-8g
     concurrent: false
     jdk: 'openjdk8'
 
@@ -166,12 +175,11 @@
         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:
@@ -203,7 +211,7 @@
 
 - job-template:
     name: 'autorelease-site-verify-{stream}'
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
     jdk: 'openjdk8'
 
@@ -218,12 +226,11 @@
         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: