X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-distribution-jobs.yaml;h=00127f5747a9776773468980390a9cebbb64e867;hb=refs%2Fchanges%2F30%2F40030%2F1;hp=57f93d3a5d0bb5b6d7705fb8f797e4f2210aac83;hpb=8e01c22efc521188260ebb84b049d9db64e26ca8;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index 57f93d3a5..00127f574 100644
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -1,23 +1,25 @@
 
 - project:
-    name: integration-distribution-jobs
+    name: integration-distribution
     jobs:
+        - '{name}-verify-python-{stream}'
         - 'integration-distribution-verify-{stream}'
         - 'integration-distribution-merge-{stream}'
         - 'integration-distribution-deploy-{stream}'
         - 'integration-distribution-offline-{stream}'
 
+    project: integration/distribution
+
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
-
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
+            jre: 'openjdk7'
 
 
 - job-template:
@@ -26,7 +28,7 @@
     project-type: maven
     node: dynamic_verify
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{jre}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -37,8 +39,10 @@
     parameters:
         - project-parameter:
             project: 'integration/distribution'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
         - integration-patch-refspec:
             branch: '$GERRIT_REFSPEC'
 
@@ -64,11 +68,14 @@
         - inject:
             properties-file: 'bundle.txt'
         - wipe-org-opendaylight-repo
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{integration-settings}'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
+        goals: 'clean install -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
         settings: '{integration-settings}'
         global-settings: '{odl-global-settings}'
@@ -91,7 +98,7 @@
 
     project-type: maven
     node: dynamic_merge
-    jdk: '{jdk}'
+    jdk: '{jre}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -102,6 +109,10 @@
     parameters:
         - project-parameter:
             project: 'integration/distribution'
+        - gerrit-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -122,11 +133,14 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{integration-settings}'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
+        goals: 'clean install -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
         settings: '{integration-settings}'
         global-settings: '{odl-global-settings}'
@@ -147,13 +161,14 @@
     name: 'integration-distribution-deploy-{stream}'
 
     project-type: freestyle
-    node: dynamic_controller
+    node: dynamic_verify
+    concurrent: true
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+        artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
         - project-parameter:
@@ -162,6 +177,8 @@
             branch: '{branch}'
         - integration-bundleurl:
             bundleurl: 'last'
+        - integration-jdk-version:
+            jdkversion: '{jre}'
 
     wrappers:
         - build-timeout
@@ -180,7 +197,7 @@
 
     publishers:
         - archive:
-            artifacts: 'karaf.log'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[integration]'
 
@@ -192,13 +209,13 @@
     name: 'integration-distribution-offline-{stream}'
 
     project-type: freestyle
-    node: dynamic_controller
+    node: dynamic_verify
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+        artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
         - project-parameter:
@@ -207,6 +224,8 @@
             branch: '{branch}'
         - integration-bundleurl:
             bundleurl: 'last'
+        - integration-jdk-version:
+            jdkversion: '{jre}'
 
     wrappers:
         - build-timeout
@@ -225,7 +244,6 @@
 
     publishers:
         - archive:
-            artifacts: 'karaf.log'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[integration]'
-