Merge "Images with pre-loaded devstack pips and yums"

[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 f5b0d4e867c272e901fc50db5fd7ca49061e8bc0..45fe379a7e1dbb8adbe03193ce41618ad0c8536f 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -31,11 +31,9 @@
     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
@@ -96,6 +96,7 @@
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
 
 
@@ -111,11 +112,9 @@
     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}'
 
@@ -202,6 +202,7 @@
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
 
 # Template: integration-distribution-deploy-{stream}
@@ -215,11 +216,9 @@
     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:
@@ -230,7 +229,7 @@
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
-            bundleurl: 'last'
+            bundleurl: '{bundleurl}'
         - integration-jdk-version:
             jdkversion: '{jre}'
 
@@ -249,6 +248,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
@@ -264,11 +264,9 @@
     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:
@@ -279,7 +277,7 @@
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
-            bundleurl: 'last'
+            bundleurl: '{bundleurl}'
         - integration-jdk-version:
             jdkversion: '{jre}'
 
@@ -298,6 +296,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs: