Merge "Add packer build and validate job to build images"

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

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index dda4674115dde2b91245c0373ddd397b30da9f46..89d8ec83bda8b46236b341ab742bb7dfb40830ab 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -48,17 +48,19 @@
         goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: 'autorelease-settings'
+        settings-type: cfp
         global-settings: 'odl-global-settings'
+        global-settings-type: cfp
         post-step-run-condition: UNSTABLE
 
     postbuilders:
         - releng-stage-release
 
     publishers:
-        - archive-artifacts:
-            artifacts: '*.log'
         - email-notification:
             email-prefix: '[releng]'
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'
 
 
 - job-template:
@@ -87,7 +89,7 @@
         - jacoco-nojava-workaround
         - releng-fetch-p2zip-if-necessary:
             maven-version: '{mvn33}'
-            settings: '{project-settings}'
+            settings: '{mvn-settings}'
             global-settings: 'odl-global-settings'
         - releng-generate-p2pom
 
@@ -95,19 +97,21 @@
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
-        settings: '{project-settings}'
+        settings: '{mvn-settings}'
         global-settings: 'odl-global-settings'
         post-step-run-condition: UNSTABLE
 
     postbuilders:
         - releng-update-p2composite-metadata:
             maven-version: '{mvn33}'
-            settings: '{project-settings}'
+            settings: '{mvn-settings}'
             global-settings: 'odl-global-settings'
 
     publishers:
         - email-notification:
             email-prefix: '[releng]'
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'
 
 # Python Related
 
@@ -193,6 +197,8 @@
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: '{project-name}-merge-rtd-{stream}'
@@ -225,6 +231,8 @@
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'
 
 # Node related
 
@@ -318,3 +326,5 @@
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'