From c2640368dd057a61fbe81a36e4871ca8aaf57faf Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 15 Dec 2017 14:33:28 -0500 Subject: [PATCH] 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 --- jjb/autorelease/autorelease-projects.yaml | 2 +- jjb/autorelease/autorelease-templates.yaml | 4 ++-- .../autorelease-version-management.yaml | 2 +- jjb/docs/docs-rtd.yaml | 2 +- jjb/integration/integration-test-jobs.yaml | 2 +- jjb/lf-infra/lf-infra-jobs.yaml | 12 ++++++------ jjb/packaging/ansible.yaml | 2 +- jjb/packaging/packaging.yaml | 12 ++++++------ jjb/releng-jobs.yaml | 18 +++++++++--------- jjb/spectrometer/spectrometer-jobs.yaml | 2 +- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 1d25ea0be..a90a1ddc3 100644 --- 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 37e0c02b2..8b9b1298c 100644 --- 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 0bb187859..fa6914f89 100644 --- 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 36ffce1a4..040e4b63b 100644 --- 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 0cf593bef..4f7feb00f 100644 --- 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 331122bb9..5af53cd53 100644 --- 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 e04867e2f..f5b147f5f 100644 --- 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 1dfc0663f..1884172ad 100644 --- 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 7dae8f737..f9cf715e6 100644 --- 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 3c6f14477..345f64713 100644 --- 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: -- 2.36.6