Merge "Add jenkins param to use featuresBoot (or not)"

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

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 997d326921e4cf202890b5e0498e9c221b7da484..574f20b7805e764523fb31f3fad49596b19a783f 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -20,7 +20,7 @@
     stream:
       - oxygen:
           branch: 'master'
-          csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr
+          csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide
           csit-list: !include: csit-jobs-oxygen.lst
           csit-sanity-list: '{csit-sanity-list-oxygen}'
           csit-weekly-list: '{csit-weekly-list-oxygen}'
@@ -44,7 +44,7 @@
           csit-high-frequency-list: '{csit-high-frequency-list-carbon}'
 
     # tools system image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
 # Template: integration-distribution-test-{stream}
 # Goal: Verify a distribution through all system test available
@@ -54,7 +54,7 @@
     name: 'integration-distribution-test-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -89,7 +89,7 @@
     name: 'integration-sanity-test-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -250,7 +250,7 @@
     # 13. Currently, the .zip lasts 24 hours (?) so you may need to jump to step 2 (or 0) after some time.
 
     project-type: freestyle
-    node: centos7-java-builder-8c-8g
+    node: centos7-java-builder-2c-8g
     jdk: '{jdk}'
 
     properties:
@@ -279,6 +279,19 @@
       - opendaylight-infra-wrappers:
           build-timeout: '1200'
 
+    triggers:
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'multipatch-build:'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '**'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+
     builders:
       - wipe-org-opendaylight-repo
       - integration-multipatch-builder
@@ -325,7 +338,7 @@
     name: 'integration-distribution-weekly-test-trigger-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -357,7 +370,7 @@
     name: 'integration-distribution-high-frequency-test-trigger-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -405,7 +418,7 @@
     #####################
 
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-2c-8g
 
     properties:
       - lf-infra-properties: