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 c008bf02d5ab7942de27465cdaf17520c6c67140..89d8ec83bda8b46236b341ab742bb7dfb40830ab 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -1,19 +1,22 @@
 - job-template:
-    name: '{name}-release-java'
+    name: '{project-name}-release-java'
 
     # Job template for producing a release candidate by creating a staging repo
     # in Nexus.
 
     project-type: maven
-    node: dynamic_merge
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
         daysToKeep: '30'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - build-tag
         - stage-id-parameter:
             stage-id: '{stage-id}'
@@ -45,31 +48,36 @@
         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:
-    name: '{name}-publish-p2repo'
+    name: '{project-name}-publish-p2repo'
 
     # Job template for publishing a p2 repo given a URL to a zipped p2repo.
 
     project-type: maven
-    node: dynamic_merge
+    node: '{build-node}'
     jdk: '{jdk}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - p2zip-parameter
 
     wrappers:
@@ -81,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
 
@@ -89,24 +97,26 @@
         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
 
 - job-template:
-    name: '{name}-verify-python-{stream}'
+    name: '{project-name}-verify-python-{stream}'
 
     # Job template for python verify jobs
     #
@@ -117,10 +127,10 @@
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
     #     toxdir:    directory containing the project's tox.ini relative to
-    #                the workspace.
+    #                the workspace. Empty works if tox.ini is at project root.
 
     project-type: freestyle
-    node: dynamic_verify
+    node: '{build-node}'
     concurrent: true
 
     logrotate:
@@ -130,12 +140,11 @@
         artifactNumToKeep: '-1'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git:
@@ -188,22 +197,23 @@
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'
 
 - job-template:
-    name: '{name}-merge-rtd-{stream}'
+    name: '{project-name}-merge-rtd-{stream}'
     # Template for ReadTheDocs triggering
 
     project-type: freestyle
-    node: dynamic_verify
+    node: '{build-node}'
     concurrent: false
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     wrappers:
         - opendaylight-infra-wrappers:
@@ -221,11 +231,13 @@
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'
 
 # Node related
 
 - job-template:
-    name: '{name}-verify-node-{stream}'
+    name: '{project-name}-verify-node-{stream}'
 
     # Job template for python verify jobs
     #
@@ -240,7 +252,7 @@
     #     nodever:   version of node to install in virtualenv
 
     project-type: freestyle
-    node: dynamic_verify
+    node: '{build-node}'
     concurrent: true
 
     logrotate:
@@ -250,12 +262,11 @@
         artifactNumToKeep: '-1'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git:
@@ -315,3 +326,5 @@
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'