Bump all java-builders to 2 core machines

This should hopefully get us back to the same build times as we had
in the old cloud.

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

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 1d25ea0be4be5047a91f8b82a730d989a2a7a982..a90a1ddc3d48485fb805cace0486295b0b3d3105 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -34,7 +34,7 @@
 
     project: releng/autorelease
     project-name: autorelease
-    build-node: centos7-java-builder-1c-4g
+    build-node: centos7-java-builder-2c-8g
     # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
     archive-artifacts: >
         **/*.prop

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 37e0c02b2db82251645ac29ed669be8b7015fc36..8b9b1298cae36d2ae2ccf1180600bb91453a9d32 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -153,7 +153,7 @@
 - job-template:
     name: autorelease-update-validate-jobs-{stream}
     project-type: freestyle
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
 
     properties:
       - lf-infra-properties:
@@ -286,7 +286,7 @@
     #####################
 
     project-type: freestyle
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
 
     properties:
       - lf-infra-properties:

diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml
index 0bb18785968c9c3dccfbc9113ec0788b1d605b84..fa6914f898d0cdd6342670822a32824c6781f02c 100644 (file)
--- a/jjb/autorelease/autorelease-version-management.yaml
+++ b/jjb/autorelease/autorelease-version-management.yaml
@@ -8,7 +8,7 @@
     project-name: autorelease-version-management
     tox-dir: scripts/version_management
 
-    build-node: centos7-java-builder-1c-4g
+    build-node: centos7-java-builder-2c-8g
 
     stream:
       - oxygen:

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 36ffce1a4f61a14e2d356b6b2dbcc6ecb254ef61..040e4b63b1edcb95b28f16c4a51c49030ebc1bf7 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -15,6 +15,6 @@
 
     project: docs
     project-name: docs
-    build-node: centos7-java-builder-1c-4g
+    build-node: centos7-java-builder-2c-8g
     rtd-project: opendaylight
     archive-artifacts: ''

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 0cf593befd4bdfac7a555801f231b5f254aeced6..4f7feb00ff7a61aad7dd3004df558a3d7b79e865 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -418,7 +418,7 @@
     #####################
 
     project-type: freestyle
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
 
     properties:
       - lf-infra-properties:

diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
index 331122bb984dc0917365d37486c4c3f9518f91b5..5af53cd53766522e4b345e3be3ffdd4b418fc2ab 100644 (file)
--- a/jjb/lf-infra/lf-infra-jobs.yaml
+++ b/jjb/lf-infra/lf-infra-jobs.yaml
@@ -6,7 +6,7 @@
 
     project-name: lf-infra-ci-workshop
     project: releng/ci-workshop
-    build-node: centos7-java-builder-1c-4g
+    build-node: centos7-java-builder-2c-8g
     stream: any
     branch: '*'
 
@@ -20,7 +20,7 @@
 
     project-name: lf-infra-common-packer
     project: releng/common-packer
-    build-node: centos7-java-builder-1c-4g
+    build-node: centos7-java-builder-2c-8g
     stream: any
     branch: '*'
 
@@ -36,7 +36,7 @@
     project-name: lf-infra-docs
     project: releng/docs
     project-pattern: releng/docs
-    build-node: centos7-java-builder-1c-4g
+    build-node: centos7-java-builder-2c-8g
     rtd-project: lf-releng-docs
     stream: any
     branch: '*'
@@ -52,7 +52,7 @@
     project-name: lf-infra-docs-conf
     project: releng/docs-conf
     project-pattern: releng/docs-conf
-    build-node: centos7-java-builder-1c-4g
+    build-node: centos7-java-builder-2c-8g
     stream: any
     branch: '*'
 
@@ -68,7 +68,7 @@
     project-name: lf-infra-global-jjb
     project: releng/global-jjb
     project-pattern: releng/global-jjb
-    build-node: centos7-java-builder-1c-4g
+    build-node: centos7-java-builder-2c-8g
     rtd-project: lf-releng-global-jjb
     stream: any
     branch: '*'
@@ -85,7 +85,7 @@
     project-name: lf-infra-lftools
     project: releng/lftools
     project-pattern: releng/lftools
-    build-node: centos7-java-builder-1c-4g
+    build-node: centos7-java-builder-2c-8g
     rtd-project: lf-releng-tools
     stream: any
     branch: '*'

diff --git a/jjb/packaging/ansible.yaml b/jjb/packaging/ansible.yaml
index e04867e2fbb52e723201b39590b5998b724d359d..f5b147f5f50ddcf634ead81f23d523ea7b744d0e 100644 (file)
--- a/jjb/packaging/ansible.yaml
+++ b/jjb/packaging/ansible.yaml
@@ -17,7 +17,7 @@
 - job-template:
     name: '{project-name}-test-rpm-{stream}'
 
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
 
     project-type: freestyle
 

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 1dfc0663fe02180021ecea5f4f7d0c00047f682b..1884172ad8c06cd807479af6637a5d56b0e4107b 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -30,7 +30,7 @@
 - job-template:
     name: 'packaging-build-rpm-{stream}'
 
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
 
     project-type: freestyle
 
@@ -108,7 +108,7 @@
 - job-template:
     name: 'packaging-build-rpm-snap-{stream}'
 
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
 
     project-type: freestyle
 
@@ -175,7 +175,7 @@
 - job-template:
     name: 'packaging-verify-rpm-master'
 
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
 
     project-type: freestyle
 
@@ -242,7 +242,7 @@
 - job-template:
     name: 'packaging-verify-full-rpm-master'
 
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
 
     project-type: freestyle
 
@@ -344,7 +344,7 @@
 - job-template:
     name: 'packaging-test-rpm-master'
 
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
 
     parameters:
       - opendaylight-infra-parameters:
@@ -395,7 +395,7 @@
 - job-template:
     name: 'packaging-test-rpm-upgrade-master'
 
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
 
     parameters:
       - opendaylight-infra-parameters:

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 7dae8f73723f26c154b12b711b6b60a0aa5bd27f..f9cf715e65257a78f24ad2f7a73ac5e7394c4282 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -20,7 +20,7 @@
     project-name: builder
     stream: master
     branch: master
-    build-node: centos7-java-builder-1c-4g
+    build-node: centos7-java-builder-2c-8g
     archive-artifacts: '**/*.log'
     build-timeout: 30
 
@@ -33,7 +33,7 @@
     project-name: builder
     branch: master
     archive-artifacts: '**/*.log'
-    build-node: centos7-java-builder-1c-4g
+    build-node: centos7-java-builder-2c-8g
 
     platforms:
       - centos
@@ -110,7 +110,7 @@
 
 - job-template:
     name: builder-check-poms
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
 
     project-type: freestyle
 
@@ -146,7 +146,7 @@
 - job-template:
     name: 'builder-verify-image-protection'
     project-type: freestyle
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -190,7 +190,7 @@
 - job-template:
     name: 'builder-cleanup-old-images'
     project-type: freestyle
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -236,7 +236,7 @@
 - job-template:
     name: builder-delete-orphaned-nodes
     project-type: freestyle
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -271,7 +271,7 @@
 - job-template:
     name: 'builder-delete-stale-nodes'
     project-type: freestyle
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -308,7 +308,7 @@
 - job-template:
     name: 'builder-delete-stale-stacks'
     project-type: freestyle
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -343,7 +343,7 @@
 - job-template:
     name: 'builder-update-image-list'
     project-type: freestyle
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:

diff --git a/jjb/spectrometer/spectrometer-jobs.yaml b/jjb/spectrometer/spectrometer-jobs.yaml
index 3c6f144770dd57100eb1f7dc9f039e4781436813..345f6471319359732d6c153715c2bbbadaaab98e 100644 (file)
--- a/jjb/spectrometer/spectrometer-jobs.yaml
+++ b/jjb/spectrometer/spectrometer-jobs.yaml
@@ -24,7 +24,7 @@
     name: 'spectrometer-deploy-webapp-master'
 
     project-type: freestyle
-    node: centos7-java-builder-1c-4g
+    node: centos7-java-builder-2c-8g
     concurrent: false
 
     properties: