Rename archive-build macro to opendaylight-infra-shiplogs

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

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 3147c7eb1b6474a38bed00deb5e96f28caca1876..6d3803c5b39f84df45071b94f66aa93c4c0468fe 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -7,10 +7,9 @@
     #   {stream}
     #   {jdk}
     name: '{project-name}-clm-{stream}'
-    disabled: {disabled}
-    node: '{build-node}'
 
     project-type: freestyle
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -57,19 +56,18 @@
     publishers:
         - email-notification:
             email-prefix: '[{project-name}]'
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
     name: '{project-name}-distribution-{stream}'
-    disabled: {disabled}
-    node: '{build-node}'
 
     # Required variables:
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -121,7 +119,7 @@
             id: ''
             unique-version: true
             deploy-unstable: false
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -132,9 +130,9 @@
 
     name: '{project-name}-distribution-check-{stream}'
     disabled: '{obj:disable_distribution_check}'
-    node: '{build-node}'
 
     project-type: freestyle
+    node: '{build-node}'
     concurrent: true
     jdk: '{jdk}'
 
@@ -226,13 +224,13 @@
             script-only-if-succeeded: False
             script-only-if-failed: False
             mark-unstable-if-failed: True
-        - archive-build:
+        - archive:
+            artifacts: '*.zip'
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
     name: '{project-name}-integration-{stream}'
-    disabled: {disabled}
-    node: '{build-node}'
 
     # Job template for ODL integration verify jobs
     #
@@ -245,6 +243,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: freestyle
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -294,13 +293,11 @@
             email-prefix: '{email-upstream}'
         - findbugs
         - jacoco-report
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
     name: '{project-name}-merge-{stream}'
-    disabled: {disabled}
-    node: '{build-node}'
 
     # Job template for ODL merge jobs
     #
@@ -312,6 +309,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -403,13 +401,11 @@
             unique-version: true
             deploy-unstable: false
         - jacoco-report
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
     name: '{project-name}-periodic-{stream}'
-    disabled: {disabled}
-    node: '{build-node}'
 
     # Job template for periodic builders
     #
@@ -421,6 +417,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: freestyle
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -465,15 +462,15 @@
             email-prefix: '[{project-name}]'
         - jacoco-report
         - findbugs
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
     name: '{project-name}-sonar'
-    disabled: {disabled}
-    node: '{build-node}'
+    disabled: false
 
     project-type: maven
+    node: '{build-node}'
     jdk: 'openjdk8'
 
     logrotate:
@@ -528,15 +525,15 @@
         - email-notification:
             email-prefix: '[{project-name}]'
         - jacoco-report
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
     name: '{project-name}-validate-autorelease-{stream}'
     disabled: '{obj:disable_autorelease}'
-    node: '{build-node}'
 
     project-type: freestyle
+    node: '{build-node}'
     concurrent: true
     jdk: '{jdk}'
 
@@ -628,13 +625,11 @@
     publishers:
         - email-notification:
             email-prefix: '[autorelease] [{project-name}]'
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
     name: '{project-name}-verify-{stream}-{maven}-{jdks}'
-    disabled: {disabled}
-    node: '{build-node}'
 
     # Job template for ODL verify jobs
     #
@@ -645,6 +640,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: freestyle
+    node: '{build-node}'
     concurrent: true
     jdk: '{jdks}'
 
@@ -692,5 +688,5 @@
         - email-notification:
             email-prefix: '[{project-name}]'
         - jacoco-report
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn-version}'