From 401bc2e921e208ce01535485a8cfe3cbcde7f425 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Wed, 6 Dec 2017 23:44:10 -0500 Subject: [PATCH] Update java-builder build-nodes for new cloud The new cloud provider has different flavours than what we were using so need to update the flavours to work in the new cloud. Issue: RELENG-707 Change-Id: I86ba856d71c429c4310054614cd22e516bbd90c3 Signed-off-by: Thanh Ha --- jjb/autorelease/autorelease-projects.yaml | 2 +- jjb/autorelease/autorelease-templates.yaml | 4 ++-- .../autorelease-version-management.yaml | 2 +- jjb/bgpcep/bgpcep.yaml | 8 ++++---- jjb/docs/docs-rtd.yaml | 2 +- jjb/integration/integration-test-jobs.yaml | 4 ++-- jjb/lf-infra/lf-infra-jobs.yaml | 12 ++++++------ jjb/lispflowmapping/lispflowmapping.yaml | 6 +++--- jjb/packaging/ansible.yaml | 2 +- jjb/packaging/packaging.yaml | 12 ++++++------ jjb/releng-jobs.yaml | 15 ++++++++------- jjb/spectrometer/spectrometer-jobs.yaml | 2 +- 12 files changed, 36 insertions(+), 35 deletions(-) diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index f7b325801..1d25ea0be 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-2c-4g + build-node: centos7-java-builder-1c-4g # 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 6ec385a89..37e0c02b2 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-2c-4g + node: centos7-java-builder-1c-4g properties: - lf-infra-properties: @@ -286,7 +286,7 @@ ##################### project-type: freestyle - node: centos7-java-builder-2c-4g + node: centos7-java-builder-1c-4g properties: - lf-infra-properties: diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index cd7937dc4..0bb187859 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-2c-4g + build-node: centos7-java-builder-1c-4g stream: - oxygen: diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index d74448505..660aabbf8 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -11,7 +11,7 @@ stream: oxygen project: 'bgpcep' project-name: 'bgpcep' - build-node: centos7-java-builder-4c-8g + build-node: centos7-java-builder-2c-8g branch: 'master' jdks: - openjdk8 @@ -45,7 +45,7 @@ stream: nitrogen project: 'bgpcep' project-name: 'bgpcep' - build-node: centos7-java-builder-4c-8g + build-node: centos7-java-builder-2c-8g branch: 'stable/nitrogen' jdks: - openjdk8 @@ -79,7 +79,7 @@ stream: carbon project: 'bgpcep' project-name: 'bgpcep' - build-node: centos7-java-builder-4c-8g + build-node: centos7-java-builder-2c-8g branch: 'stable/carbon' karaf-version: karaf3 jdks: @@ -109,7 +109,7 @@ project: 'bgpcep' project-name: 'bgpcep' - build-node: centos7-java-builder-4c-8g + build-node: centos7-java-builder-2c-8g branch: 'master' mvn-settings: 'bgpcep-settings' mvn-goals: 'clean -DrepoBuild install javadoc:aggregate' diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index f2a487b24..36ffce1a4 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-2c-4g + build-node: centos7-java-builder-1c-4g rtd-project: opendaylight archive-artifacts: '' diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index da480d043..a2ba658ca 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -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: @@ -418,7 +418,7 @@ ##################### project-type: freestyle - node: centos7-java-builder-2c-4g + node: centos7-java-builder-1c-4g properties: - lf-infra-properties: diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml index 1ca312083..331122bb9 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-2c-4g + build-node: centos7-java-builder-1c-4g stream: any branch: '*' @@ -20,7 +20,7 @@ project-name: lf-infra-common-packer project: releng/common-packer - build-node: centos7-java-builder-2c-4g + build-node: centos7-java-builder-1c-4g stream: any branch: '*' @@ -36,7 +36,7 @@ project-name: lf-infra-docs project: releng/docs project-pattern: releng/docs - build-node: centos7-java-builder-2c-4g + build-node: centos7-java-builder-1c-4g 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-2c-4g + build-node: centos7-java-builder-1c-4g 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-2c-4g + build-node: centos7-java-builder-1c-4g 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-2c-4g + build-node: centos7-java-builder-1c-4g rtd-project: lf-releng-tools stream: any branch: '*' diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 13abf4e69..238608123 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -23,7 +23,7 @@ dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' archive-artifacts: '' - build-node: centos7-java-builder-4c-8g + build-node: centos7-java-builder-2c-8g # Used by the release job staging-profile-id: 96fff2503b766 @@ -52,7 +52,7 @@ dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' archive-artifacts: '' - build-node: centos7-java-builder-4c-8g + build-node: centos7-java-builder-2c-8g # Used by the release job staging-profile-id: 96fff2503b766 @@ -82,7 +82,7 @@ dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' archive-artifacts: '' - build-node: centos7-java-builder-4c-8g + build-node: centos7-java-builder-2c-8g # Used by the release job staging-profile-id: 96fff2503b766 diff --git a/jjb/packaging/ansible.yaml b/jjb/packaging/ansible.yaml index dcf221405..a2ec835bd 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-2c-4g + node: centos7-java-builder-1c-4g project-type: freestyle diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index ec2200683..5ee3440fe 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-2c-4g + node: centos7-java-builder-1c-4g project-type: freestyle @@ -97,7 +97,7 @@ - job-template: name: 'packaging-build-rpm-snap-{stream}' - node: centos7-java-builder-2c-4g + node: centos7-java-builder-1c-4g project-type: freestyle @@ -163,7 +163,7 @@ - job-template: name: 'packaging-verify-rpm-master' - node: centos7-java-builder-2c-4g + node: centos7-java-builder-1c-4g project-type: freestyle @@ -230,7 +230,7 @@ - job-template: name: 'packaging-verify-full-rpm-master' - node: centos7-java-builder-2c-4g + node: centos7-java-builder-1c-4g project-type: freestyle @@ -332,7 +332,7 @@ - job-template: name: 'packaging-test-rpm-master' - node: centos7-java-builder-2c-4g + node: centos7-java-builder-1c-4g parameters: - opendaylight-infra-parameters: @@ -383,7 +383,7 @@ - job-template: name: 'packaging-test-rpm-upgrade-master' - node: centos7-java-builder-2c-4g + node: centos7-java-builder-1c-4g parameters: - opendaylight-infra-parameters: diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index e55f672cc..93c8e6146 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -19,7 +19,7 @@ project-name: builder stream: master branch: master - build-node: centos7-java-builder-2c-4g + build-node: centos7-java-builder-1c-4g archive-artifacts: '**/*.log' build-timeout: 10 @@ -32,6 +32,7 @@ project-name: builder branch: master archive-artifacts: '**/*.log' + build-node: centos7-java-builder-1c-4g platforms: - centos @@ -108,7 +109,7 @@ - job-template: name: builder-check-poms - node: centos7-java-builder-2c-4g + node: centos7-java-builder-1c-4g project-type: freestyle @@ -144,7 +145,7 @@ - job-template: name: 'builder-verify-image-visibility' project-type: freestyle - node: centos7-java-builder-2c-4g + node: centos7-java-builder-1c-4g os-cloud: 'odlpriv-sandbox' @@ -191,7 +192,7 @@ - job-template: name: 'builder-cleanup-old-images' project-type: freestyle - node: centos7-java-builder-2c-4g + node: centos7-java-builder-1c-4g properties: - opendaylight-infra-properties: @@ -237,7 +238,7 @@ - job-template: name: 'builder-delete-stale-nodes' project-type: freestyle - node: centos7-java-builder-2c-4g + node: centos7-java-builder-1c-4g properties: - opendaylight-infra-properties: @@ -274,7 +275,7 @@ - job-template: name: 'builder-delete-stale-stacks' project-type: freestyle - node: centos7-java-builder-2c-4g + node: centos7-java-builder-1c-4g properties: - opendaylight-infra-properties: @@ -309,7 +310,7 @@ - job-template: name: 'builder-update-image-list' project-type: freestyle - node: centos7-java-builder-2c-4g + node: centos7-java-builder-1c-4g properties: - opendaylight-infra-properties: diff --git a/jjb/spectrometer/spectrometer-jobs.yaml b/jjb/spectrometer/spectrometer-jobs.yaml index 6291f9490..3c6f14477 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-2c-4g + node: centos7-java-builder-1c-4g concurrent: false properties: -- 2.36.6