X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fintegration%2Fintegration-distribution-jobs.yaml;h=45fe379a7e1dbb8adbe03193ce41618ad0c8536f;hb=f571cb39b33e760f2267691cf97d792d36848882;hp=b57211c7ba159c200f4c3237a0e7bbbadcef513d;hpb=c6dd8be243134ba5a87db1a2eb96b90452608f3d;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index b57211c7b..45fe379a7 100644
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -21,26 +21,19 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            disabled: true
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
 
 - job-template:
     name: 'integration-distribution-verify-{stream}'
-    disabled: {disabled}
-    node: centos7-java-builder-2c-8g
 
     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:
@@ -61,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
@@ -75,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'
@@ -98,24 +93,28 @@
 
     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}'
-    disabled: {disabled}
-    node: centos7-java-builder-2c-8g
+
+    # 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
     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:
@@ -136,6 +135,7 @@
     triggers:
         - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
+            server-name: '{server-name}'
             name: 'integration/distribution'
             branch: '{branch}'
 
@@ -147,7 +147,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 -Dmerge -Dstream={stream}'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -170,7 +170,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:
@@ -180,7 +180,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:
@@ -199,9 +199,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}
@@ -210,17 +211,14 @@
 
 - job-template:
     name: 'integration-distribution-deploy-{stream}'
-    disabled: {disabled}
-    node: centos7-java-builder-2c-8g
 
     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:
@@ -231,7 +229,7 @@
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
-            bundleurl: 'last'
+            bundleurl: '{bundleurl}'
         - integration-jdk-version:
             jdkversion: '{jre}'
 
@@ -250,10 +248,11 @@
 
     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
@@ -261,16 +260,13 @@
 
 - job-template:
     name: 'integration-distribution-offline-{stream}'
-    disabled: {disabled}
-    node: centos7-java-builder-2c-8g
 
     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:
@@ -281,7 +277,7 @@
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
-            bundleurl: 'last'
+            bundleurl: '{bundleurl}'
         - integration-jdk-version:
             jdkversion: '{jre}'
 
@@ -300,7 +296,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'