Update integration jobs to use new build labels

Change-Id: I74b7791dc785168a9e90d782d33e37b0102c509c
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index b925ae0bb02ffbfca299dd2d65d9e856a9acf7c5..3a545608ba6c502a858a9efc428a505b1c5fe782 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -26,7 +26,7 @@
     name: 'integration-distribution-verify-{stream}'
 
     project-type: maven
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
     jdk: '{jre}'
 
@@ -101,7 +101,7 @@
     name: 'integration-distribution-merge-{stream}'
 
     project-type: maven
-    node: dynamic_merge
+    node: centos7-java-builder-2c-8g
     jdk: '{jre}'
 
     logrotate:
@@ -205,7 +205,7 @@
     name: 'integration-distribution-deploy-{stream}'
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
 
     logrotate:
@@ -255,7 +255,7 @@
     name: 'integration-distribution-offline-{stream}'
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 17b0f20770ca82ae6ebe0b2ef14e8ad1ecaa49ac..195e69d25e32045ccda5291285923d8fdc55fa38 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -29,7 +29,7 @@
     disabled: false
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -114,7 +114,7 @@
     disabled: false
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -223,7 +223,7 @@
     disabled: false
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -331,7 +331,7 @@
     disabled: false
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -417,7 +417,7 @@
     disabled: false
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -527,7 +527,7 @@
     disabled: false
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -636,7 +636,7 @@
     disabled: false
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -741,7 +741,7 @@
     disabled: false
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -855,7 +855,7 @@
     name: '{project}-patch-test-{stream}'
 
     project-type: maven
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     jdk: '{jdk}'
 
     logrotate:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 171e1bbb19a70a1f39aa9cd4378eafe0680e7dfc..f586efe0cc5162dc43e22644877d54a92162abe3 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -175,7 +175,7 @@
     name: 'integration-csit-verify-1node-library'
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -270,7 +270,7 @@
     name: 'integration-distribution-test-{stream}'
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -307,7 +307,7 @@
     name: 'integration-patch-test-{stream}'
 
     project-type: maven
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     jdk: '{jdk}'
 
     logrotate:
@@ -411,7 +411,7 @@
     name: 'integration-multipatch-test-{stream}'
 
     project-type: maven
-    node: dynamic_verify_8c
+    node: centos7-java-builder-8c-8g
     jdk: '{jdk}'
 
     logrotate:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 3fb96db5150909fd1d921b2b717a565203eef272..fd6060a790d97437534691da8a376f640c3a582a 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -9,7 +9,7 @@
     build-artifact-num-to-keep: 5
     # Timeout in minutes
     build-timeout: 360
-    build-node: dynamic_verify
+    build-node: centos7-java-builder-2c-8g
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''
@@ -32,9 +32,9 @@
     02-plot-data-file: 'plot-data.csv'
 
     # CSIT images configuration
-    controller-image: 'centos7-java'
-    openstack-image: 'centos7-devstack'
-    mininet-image: 'ubuntu-trusty-mininet'
+    controller-image: 'centos7-java-builder-2c-4g'
+    openstack-image: 'centos7-devstack-2c-4g'
+    mininet-image: 'ubuntu-trusty-mininet-2c-2g'
     mininet-vms: 1
 
     # In case a CSIT job is merged without Java version specified