Merge changes from topic 'RELENG-704'

[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 17a814f5203e5a0ba4a58bd46aedc47e0d1c31f9..0cf593befd4bdfac7a555801f231b5f254aeced6 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -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-1c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -89,7 +89,7 @@
     name: 'integration-sanity-test-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-1c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -159,7 +159,7 @@
 
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'test-integration'
@@ -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:
@@ -338,7 +338,7 @@
     name: 'integration-distribution-weekly-test-trigger-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-1c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -370,7 +370,7 @@
     name: 'integration-distribution-high-frequency-test-trigger-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-1c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -418,7 +418,7 @@
     #####################
 
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-1c-4g
 
     properties:
       - lf-infra-properties: