X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fintegration%2Fintegration-distribution-jobs.yaml;h=2641914ab823f592924e767fb446a31fd3089407;hb=6c7d839761c8d03a24f48404d86524156c5e8ccd;hp=b7265586d4eb0ac01ab06e96d757a500932ff88d;hpb=0bce2deec8afba3f0761959487c8d7d7773daa7b;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index b7265586d..2641914ab 100644
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -3,39 +3,37 @@
     name: integration-distribution
     jobs:
         - '{project-name}-verify-python-{stream}'
-        - 'integration-distribution-verify-{stream}'
-        - 'integration-distribution-merge-{stream}'
-        - 'integration-distribution-deploy-{stream}'
-        - 'integration-distribution-offline-{stream}'
+        - 'distribution-verify-{stream}'
+        - 'distribution-merge-{stream}'
+        - 'distribution-deploy-{stream}'
+        - 'distribution-offline-{stream}'
 
     project: integration/distribution
     project-name: integration-distribution
 
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
 
 - job-template:
-    name: 'integration-distribution-verify-{stream}'
+    name: 'distribution-verify-{stream}'
 
     project-type: maven
     node: centos7-java-builder-2c-8g
     concurrent: true
     jdk: '{jre}'
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
         - opendaylight-infra-parameters:
@@ -56,9 +54,11 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-relevant-patch-submitted:
-            name: 'integration/distribution'
+        - gerrit-trigger-patch-submitted:
+            server: '{server-name}'
+            project: '{project}'
             branch: '{branch}'
+            files: '**'
 
     prebuilders:
         - integration-get-bundle-url-root
@@ -70,7 +70,7 @@
             settings-file: 'integration-settings'
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'pom.xml'
         goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dstream={stream}'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -93,30 +93,35 @@
 
     publishers:
         - jacoco-report
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
 
+
 - job-template:
-    name: 'integration-distribution-merge-{stream}'
+    name: 'distribution-merge-{stream}'
+
+    # Need to keep jobs that deploy to Nexus at end of build as Maven
+    # projects. Maybe reconsider this once upstream moves deploy to a
+    # separate lifecycle:
+    #     https://issues.apache.org/jira/browse/MNG-5666
 
     project-type: maven
-    node: centos7-java-builder-2c-8g
+    node: '{build-node}'
     jdk: '{jre}'
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
         - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof **/target/surefire-reports/*-output.txt'
 
     scm:
         - gerrit-trigger-scm:
@@ -128,8 +133,8 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
+            server-name: '{server-name}'
             name: 'integration/distribution'
             branch: '{branch}'
 
@@ -139,9 +144,11 @@
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
             settings-file: 'integration-settings'
+        - distribute-build-url:
+            path: 'distribution-karaf/src/main/assembly'
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'pom.xml'
         goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dmerge -Dstream={stream}'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -164,7 +171,7 @@
             # project is configured in a certain way which ODL is not.
             steps:
             - maven-target:
-                maven-version: '{mvn33}'
+                maven-version: 'mvn33'
                 pom: pom.xml
                 goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
@@ -174,7 +181,7 @@
                 global-settings: 'odl-global-settings'
                 global-settings-type: cfp
             - maven-target:
-                maven-version: '{mvn33}'
+                maven-version: 'mvn33'
                 pom: deploy-site.xml
                 goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
@@ -193,9 +200,10 @@
             unique-version: true
             deploy-unstable: false
         - jacoco-report
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
 
 # Template: integration-distribution-deploy-{stream}
@@ -203,17 +211,15 @@
 # Operation: This job deploys the controller installing odl-integration-all
 
 - job-template:
-    name: 'integration-distribution-deploy-{stream}'
+    name: 'distribution-deploy-{stream}'
 
     project-type: freestyle
     node: centos7-java-builder-2c-8g
     concurrent: true
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
         - opendaylight-infra-parameters:
@@ -224,7 +230,7 @@
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
-            bundleurl: 'last'
+            bundleurl: '{bundleurl}'
         - integration-jdk-version:
             jdkversion: '{jre}'
 
@@ -243,26 +249,25 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
         - integration-csit-archive-build
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 # Template: integration-distribution-offline-{stream}
 # Goal: Verify distribution can start with no internet connection
 # Operation: This job deploys the controller removing any external repository definition
 
 - job-template:
-    name: 'integration-distribution-offline-{stream}'
+    name: 'distribution-offline-{stream}'
 
     project-type: freestyle
     node: centos7-java-builder-2c-8g
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
         - opendaylight-infra-parameters:
@@ -273,7 +278,7 @@
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
-            bundleurl: 'last'
+            bundleurl: '{bundleurl}'
         - integration-jdk-version:
             jdkversion: '{jre}'
 
@@ -292,7 +297,8 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
         - integration-csit-archive-build
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'