From e709a0a2416b9e322a748040621da5141fce283c Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 2 Feb 2018 13:41:49 -0500 Subject: [PATCH] Switch projects that need 8g to 8c-8g machines Change-Id: I9b06b93bb2ed62f7d67730ca726445e1cf7eade8 Signed-off-by: Thanh Ha --- jjb/bgpcep/bgpcep.yaml | 8 ++++---- jjb/controller/controller.yaml | 4 ++++ jjb/mdsal/mdsal.yaml | 4 ++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index ce7887fb8..2a4168e93 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -10,7 +10,7 @@ stream: oxygen project: 'bgpcep' project-name: 'bgpcep' - build-node: centos7-builder-2c-8g + build-node: centos7-builder-8c-8g build-timeout: 120 branch: 'master' mvn-settings: 'bgpcep-settings' @@ -38,7 +38,7 @@ stream: nitrogen project: 'bgpcep' project-name: 'bgpcep' - build-node: centos7-builder-2c-8g + build-node: centos7-builder-8c-8g build-timeout: 120 branch: 'stable/nitrogen' mvn-settings: 'bgpcep-settings' @@ -66,7 +66,7 @@ stream: carbon project: 'bgpcep' project-name: 'bgpcep' - build-node: centos7-builder-2c-8g + build-node: centos7-builder-8c-8g build-timeout: 120 branch: 'stable/carbon' karaf-version: karaf3 @@ -91,7 +91,7 @@ project: 'bgpcep' project-name: 'bgpcep' - build-node: centos7-builder-2c-8g + build-node: centos7-builder-8c-8g branch: 'master' mvn-settings: 'bgpcep-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 8b698b32f..79d595d87 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -14,6 +14,7 @@ mvn-settings: 'controller-settings' mvn-goals: 'clean deploy -Pintegrationtests,docs' mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + build-node: centos7-builder-8c-8g build-timeout: 90 dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' email-upstream: '[controller] [odlparent] [yangtools] [aaa]' @@ -36,6 +37,7 @@ mvn-settings: 'controller-settings' mvn-goals: 'clean deploy -Pintegrationtests,docs' mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + build-node: centos7-builder-8c-8g build-timeout: 90 dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' email-upstream: '[controller] [odlparent] [yangtools] [aaa]' @@ -59,6 +61,7 @@ mvn-settings: 'controller-settings' mvn-goals: 'clean deploy -Pintegrationtests,docs' mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + build-node: centos7-builder-8c-8g build-timeout: 90 dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' email-upstream: '[controller] [odlparent] [yangtools] [aaa]' @@ -75,6 +78,7 @@ project: 'controller' project-name: 'controller' branch: master + build-node: centos7-builder-8c-8g mvn-settings: 'controller-settings' mvn-goals: 'clean deploy -Pintegrationtests,docs' mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index a52d25ce2..12100b8a8 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -14,6 +14,7 @@ mvn-settings: 'mdsal-settings' mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' + build-node: centos7-builder-8c-8g build-timeout: 90 dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[mdsal] [odlparent] [yangtools]' @@ -34,6 +35,7 @@ project: 'mdsal' project-name: 'mdsal' branch: 'stable/nitrogen' + build-node: centos7-builder-8c-8g mvn-settings: 'mdsal-settings' mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' @@ -56,6 +58,7 @@ project: 'mdsal' project-name: 'mdsal' branch: 'stable/carbon' + build-node: centos7-builder-8c-8g karaf-version: karaf3 mvn-settings: 'mdsal-settings' mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' @@ -74,6 +77,7 @@ project: 'mdsal' project-name: 'mdsal' branch: 'master' + build-node: centos7-builder-8c-8g mvn-settings: 'mdsal-settings' mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' -- 2.36.6