Provide maven settings for distribution related jobs

[releng/builder.git] / jjb / integration / integration-distribution-jobs.yaml

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index d4f11ef47bfd58435b897ff4b1b0ddac4c3715fa..00127f5747a9776773468980390a9cebbb64e867 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -1,25 +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:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
-        - stable-helium:
-            branch: 'stable/helium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
 
 - job-template:
@@ -28,7 +28,7 @@
     project-type: maven
     node: dynamic_verify
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{jre}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -39,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'
 
@@ -66,6 +68,9 @@
         - 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}'
@@ -93,7 +98,7 @@
 
     project-type: maven
     node: dynamic_merge
-    jdk: '{jdk}'
+    jdk: '{jre}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -104,6 +109,10 @@
     parameters:
         - project-parameter:
             project: 'integration/distribution'
+        - gerrit-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -124,6 +133,9 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{integration-settings}'
 
     maven:
         maven-name: '{mvn33}'
@@ -150,12 +162,13 @@
 
     project-type: freestyle
     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:
@@ -165,7 +178,7 @@
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-jdk-version:
-            jdkversion: '{jdk}'
+            jdkversion: '{jre}'
 
     wrappers:
         - build-timeout
@@ -184,9 +197,7 @@
 
     publishers:
         - archive:
-            artifacts: 'karaf.log'
-        - archive:
-            artifacts: 'karaf_console.log'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[integration]'
 
@@ -204,7 +215,7 @@
         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:
@@ -214,7 +225,7 @@
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-jdk-version:
-            jdkversion: '{jdk}'
+            jdkversion: '{jre}'
 
     wrappers:
         - build-timeout
@@ -233,6 +244,6 @@
 
     publishers:
         - archive:
-            artifacts: 'karaf.log'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[integration]'