From 705e41beff78fc69c4a5000d41a3181896d0bc53 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Mon, 30 Mar 2020 10:33:41 -0400 Subject: [PATCH] Update AAI jjbs to use ubuntu 1804 Issue-ID: AAI-2849 Change-Id: Ic808db184eb6536b6b60f04e1750633bd8bd44fb Signed-off-by: Jimmy Forsyth --- jjb/aai/aai-aai-common.yaml | 12 ++++++------ jjb/aai/aai-babel.yaml | 6 +++--- jjb/aai/aai-cacher.yaml | 6 +++--- jjb/aai/aai-data-router.yaml | 4 ++-- jjb/aai/aai-esr-gui.yaml | 4 ++-- jjb/aai/aai-esr-server.yaml | 6 +++--- jjb/aai/aai-event-client.yaml | 2 +- jjb/aai/aai-graphadmin.yaml | 6 +++--- jjb/aai/aai-graphgraph.yaml | 2 +- jjb/aai/aai-logging-service.yaml | 2 +- jjb/aai/aai-model-loader.yaml | 8 ++++---- jjb/aai/aai-resources.yaml | 8 ++++---- jjb/aai/aai-rest-client.yaml | 2 +- jjb/aai/aai-router-core-service.yaml | 2 +- jjb/aai/aai-schema-service.yaml | 6 +++--- jjb/aai/aai-search-data-service.yaml | 8 ++++---- jjb/aai/aai-sparky-be.yaml | 6 +++--- jjb/aai/aai-sparky-fe.yaml | 4 ++-- jjb/aai/aai-validation.yaml | 6 +++--- 19 files changed, 50 insertions(+), 50 deletions(-) diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 5f10f9a5d..448dfa364 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -28,7 +28,7 @@ mvn-version: 'mvn35' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: aai-aai-common-sonar @@ -40,7 +40,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/aai-common' project-name: 'aai-aai-common' branch: 'master' @@ -55,7 +55,7 @@ jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/aai-common' project-name: 'aai-aai-common' stream: @@ -81,7 +81,7 @@ - '{project-name}-{stream}-merge-docker' - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' project-name: 'aai-aai-common' @@ -97,12 +97,12 @@ mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' files: 'Dockerfiles/aai-common/**' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - project: name: 'aai-aai-common-whitesource' project-name: 'aai-aai-common' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - gerrit-whitesource-scan mvn-params: '-P spring-boot-2-1' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 9f3efcd0e..bdae0752a 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -17,7 +17,7 @@ maven-versions-plugin: true - gerrit-maven-docker-stage: mvn-params: '-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -31,7 +31,7 @@ mvn-settings: 'aai-babel-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: aai-babel-sonar @@ -43,7 +43,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/babel' project-name: 'aai-babel' branch: 'master' diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml index a578d491a..30b06d5e3 100644 --- a/jjb/aai/aai-cacher.yaml +++ b/jjb/aai/aai-cacher.yaml @@ -11,7 +11,7 @@ maven-versions-plugin: true - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -26,7 +26,7 @@ mvn-version: 'mvn35' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: aai-cacher-sonar @@ -38,7 +38,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/cacher' project-name: 'aai-cacher' branch: 'master' diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index ee20e921b..2c34a4381 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -17,7 +17,7 @@ maven-versions-plugin: true - gerrit-maven-docker-stage: mvn-params: '-P docker -B -Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -42,7 +42,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/data-router' project-name: 'aai-data-router' branch: 'master' diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index ef1a858ac..7d18a8637 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -17,7 +17,7 @@ maven-versions-plugin: true - gerrit-maven-docker-stage: mvn-params: '-f distribution/pom.xml -P docker docker:build -B -Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -33,7 +33,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: aai-esr-gui-clm diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index 952eebe20..f66b464b5 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -17,7 +17,7 @@ maven-versions-plugin: true - gerrit-maven-docker-stage: mvn-params: '-f standalone/pom.xml -P docker docker:build -B -Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -33,7 +33,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: aai-esr-server-sonar @@ -45,7 +45,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/esr-server' project-name: 'aai-esr-server' branch: 'master' diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index 327eced03..c08d6afff 100644 --- a/jjb/aai/aai-event-client.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -37,7 +37,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/event-client' project-name: 'aai-event-client' branch: 'master' diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 0fb84cd9a..139cfd861 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -17,7 +17,7 @@ maven-versions-plugin: true - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -32,7 +32,7 @@ mvn-version: 'mvn35' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: aai-graphadmin-sonar @@ -44,7 +44,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/graphadmin' project-name: 'aai-graphadmin' branch: 'master' diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index 4bf96469f..a6a182aa0 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -17,7 +17,7 @@ maven-versions-plugin: true - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 1c0dc70bf..693cc690d 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -37,7 +37,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/logging-service' project-name: 'aai-logging-service' branch: 'master' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 2a9c7c1c5..829909b9a 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -17,7 +17,7 @@ maven-versions-plugin: true - gerrit-maven-docker-stage: mvn-params: '-P docker -B -Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -32,7 +32,7 @@ mvn-settings: 'aai-model-loader-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: aai-model-loader-sonar @@ -44,7 +44,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/model-loader' project-name: 'aai-model-loader' branch: 'master' @@ -79,7 +79,7 @@ - project: name: 'aai-model-loader-whitesource' project-name: 'aai-model-loader' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - gerrit-whitesource-scan mvn-settings: 'aai-model-loader-settings' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 0aa2168a0..e930f11cd 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -17,7 +17,7 @@ maven-versions-plugin: true - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -32,7 +32,7 @@ mvn-version: 'mvn35' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: aai-resources-sonar @@ -44,7 +44,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/resources' project-name: 'aai-resources' branch: 'master' @@ -78,7 +78,7 @@ - project: name: 'aai-resources-whitesource' project-name: 'aai-resources' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - gerrit-whitesource-scan mvn-settings: 'aai-resources-settings' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index ffe1633bf..8bd004f97 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -37,7 +37,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/rest-client' project-name: 'aai-rest-client' branch: 'master' diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index 9cb614e6b..f74baf28b 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -37,7 +37,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/router-core' project-name: 'aai-router-core' branch: 'master' diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 9351c8513..b7a3e3dbe 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -17,7 +17,7 @@ maven-versions-plugin: true - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -32,7 +32,7 @@ mvn-version: 'mvn35' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: aai-schema-service-sonar @@ -44,7 +44,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/schema-service' project-name: 'aai-schema-service' branch: 'master' diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index a780e9cac..fbcb6be39 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -17,7 +17,7 @@ maven-versions-plugin: true - gerrit-maven-docker-stage: mvn-params: '-Pdocker -B -Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -39,7 +39,7 @@ jobs: - gerrit-maven-docker-stage: mvn-params: '-Pdocker -B -Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/search-data-service' @@ -61,7 +61,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/search-data-service' project-name: 'aai-search-data-service' branch: 'master' @@ -93,7 +93,7 @@ - project: name: 'aai-search-data-service-whitesource' project-name: 'aai-search-data-service' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - gerrit-whitesource-scan mvn-settings: 'aai-search-data-service-settings' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index c27ea7104..60bbef5f3 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -17,7 +17,7 @@ maven-versions-plugin: true - gerrit-maven-docker-stage: mvn-params: '-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -42,7 +42,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/sparky-be' project-name: 'aai-sparky-be' branch: 'master' @@ -74,7 +74,7 @@ - project: name: 'aai-sparky-be-whitesource' project-name: 'aai-sparky-be' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - gerrit-whitesource-scan mvn-settings: 'aai-sparky-be-settings' diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index 63596eef1..3d2b4275c 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -40,7 +40,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/sparky-fe' project-name: 'aai-sparky-fe' branch: 'master' diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml index a755f5e86..45f764a28 100644 --- a/jjb/aai/aai-validation.yaml +++ b/jjb/aai/aai-validation.yaml @@ -17,7 +17,7 @@ maven-versions-plugin: true - gerrit-maven-docker-stage: mvn-params: 'docker:build -B -Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -31,7 +31,7 @@ mvn-settings: 'aai-validation-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: aai-validation-sonar @@ -43,7 +43,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'aai/validation' project-name: 'aai-validation' branch: 'master' -- 2.16.6