diff options
Diffstat (limited to 'jjb')
93 files changed, 442 insertions, 215 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..fada8bd91 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': @@ -28,11 +28,10 @@ branch: 'elalto' - 'master': branch: 'master' - mvn-params: '-P spring-boot-2-1' 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,11 +43,10 @@ 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' - mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-model-loader-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -63,7 +61,6 @@ stream: - 'master': branch: 'master' - mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-model-loader-settings' - project: @@ -73,17 +70,15 @@ - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g project: aai/model-loader - mvn-params: '-P spring-boot-2-1' branch: master - 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' - mvn-params: '-P spring-boot-2-1' wss-product-name: 'aai' mvn-clean-install: true project: 'aai/model-loader' 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' diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index 7bd08ae2f..37e227239 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -4,11 +4,11 @@ project-name: 'appc' jobs: - '{project-name}-{stream}-verify-java': - build-node: ubuntu1804-builder-8c-8g + build-node: ubuntu1804-docker-8c-8g mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - '{project-name}-{stream}-merge-java': - build-node: ubuntu1804-builder-8c-8g + build-node: ubuntu1804-docker-8c-8g mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - gerrit-maven-stage: @@ -57,7 +57,7 @@ - gerrit-maven-clm: mvn-params: '-DskipTests' build-timeout: 60 - build-node: ubuntu1804-builder-8c-8g + build-node: ubuntu1804-docker-8c-8g mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" nexus-iq-namespace: 'onap-' project: 'appc' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 218bd2b9c..be94c4f07 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -83,7 +83,7 @@ - project: name: ccsdk-distribution-whitesource project-name: ccsdk-distribution - build-node: ubuntu1804-builder-8c-8g + build-node: ubuntu1804-builder-4c-4g jobs: - gerrit-whitesource-scan: java-opts: '-Xmx2048m' diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index d5fb682f7..b4a116ad0 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -79,7 +79,7 @@ - project: name: ccsdk-features-whitesource - build-node: ubuntu1804-builder-8c-8g + build-node: ubuntu1804-builder-4c-4g project-name: ccsdk-features jobs: - gerrit-whitesource-scan diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index 0f2f046c9..ad92332ef 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -82,7 +82,7 @@ - project: name: ccsdk-sli-adaptors-whitesource - build-node: ubuntu1804-builder-8c-8g + build-node: ubuntu1804-builder-4c-4g project-name: ccsdk-sli-adaptors jobs: - gerrit-whitesource-scan diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index f8014bf95..79b4853f8 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -14,7 +14,6 @@ platforms: - centos-7 - - ubuntu-16.04 - ubuntu-18.04 templates: builder @@ -33,7 +32,6 @@ platforms: - centos-7 - - ubuntu-16.04 - ubuntu-18.04-arm64 - ubuntu-18.04 templates: docker diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index ef105ffab..4d1f3de26 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -28,7 +28,7 @@ pom: 'deployment/docker/pom.xml' mvn-goals: 'docker:build' docker-image-name: 'onap/cli' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'cli' stream: - 'master': @@ -36,7 +36,7 @@ mvn-settings: 'cli-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: cli-arm64 @@ -66,7 +66,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: 'cli' project-name: 'cli' branch: 'master' @@ -83,7 +83,7 @@ project-name: 'cli' branch: 'master' mvn-settings: 'cli-settings' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: cli-info diff --git a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml index fa3ad68c6..4e65ab981 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml @@ -29,7 +29,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: 'dcaegen2/analytics/pnda' project-name: 'dcaegen2-analytics-pnda' branch: 'master' @@ -43,7 +43,7 @@ - gerrit-maven-clm nexus-iq-namespace: 'onap-' project: dcaegen2/analytics/pnda - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project-name: 'dcaegen2-analytics-pnda' branch: 'master' mvn-settings: 'dcaegen2-analytics-pnda-settings' diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml index 2e2296c77..bcb4f91eb 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml @@ -14,7 +14,7 @@ maven-deploy-properties: | deployAtEnd=true archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g jobs: - '{project-name}-{stream}-verify-java': @@ -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: 'dcaegen2/analytics/tca' project-name: 'dcaegen2-analytics-tca' branch: 'master' @@ -54,7 +54,7 @@ project: 'dcaegen2/analytics/tca' project-name: 'dcaegen2-analytics-tca' branch: 'master' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g mvn-settings: 'dcaegen2-analytics-tca-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml index 2fc095186..d2a986837 100644 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -84,7 +84,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: 'dcaegen2/services' project-name: 'dcaegen2-services-bbs-event-processor' branch: 'master' diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index 305ca378b..2cec1347f 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -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: 'demo' project-name: 'demo' branch: 'master' diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index d24124f8a..b20bbc5e0 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -12,7 +12,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g mvn-goals: 'clean package -P docker docker:build docker:push' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index 18cb10745..703445322 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -5,7 +5,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g mvn-goals: 'clean package -P docker docker:build docker:push' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' @@ -32,7 +32,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: 'dmaap/datarouter' project-name: 'dmaap-datarouter' branch: 'master' diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index 5793822fe..38f4a5f9b 100644 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -36,7 +36,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: 'dmaap/dbcapi' project-name: 'dmaap-dbcapi' branch: 'master' diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml index b09e30ea7..1b3bfa6f8 100644 --- a/jjb/dmaap/dmaap-kafka-docker.yaml +++ b/jjb/dmaap/dmaap-kafka-docker.yaml @@ -5,7 +5,7 @@ project-name: 'dmaap-kafka-docker' jobs: - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' @@ -21,7 +21,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: 'docker' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - project: name: dmaap-kafka-docker-info diff --git a/jjb/dmaap/dmaap-kafka.yaml b/jjb/dmaap/dmaap-kafka.yaml index f3b4fb8cd..350eb0308 100644 --- a/jjb/dmaap/dmaap-kafka.yaml +++ b/jjb/dmaap/dmaap-kafka.yaml @@ -21,7 +21,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: 'dmaap/kafka11aaf' project-name: 'dmaap-kafka' branch: 'master' diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index d92e85a34..6549204a2 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -29,7 +29,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: 'dmaap/messagerouter/dmaapclient' project-name: 'dmaap-messagerouter-dmaapclient' branch: 'master' diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml index 21a8ba535..82c12d3d3 100644 --- a/jjb/dmaap/dmaap-messagerouter-docker.yaml +++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml @@ -5,7 +5,7 @@ project-name: 'dmaap-messagerouter-docker' jobs: - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g mvn-params: '-P docker -Dmaven.test.skip=true' maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' @@ -21,7 +21,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: 'docker' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - project: name: dmaap-messagerouter-docker-clm @@ -30,7 +30,7 @@ nexus-iq-namespace: 'onap-' project: dmaap/messagerouter/messageservice project-name: 'dmaap-messagerouter-docker' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g branch: 'master' mvn-settings: 'dmaap-messagerouter-messageservice-settings' diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index ba23d9a1c..3c0df034a 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -28,7 +28,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: 'dmaap/messagerouter/messageservice' project-name: 'dmaap-messagerouter-messageservice' branch: 'master' diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index 2d32ea0d6..331176ad3 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -30,7 +30,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: 'dmaap/messagerouter/mirroragent' project-name: 'dmaap-messagerouter-mirroragent' branch: 'master' diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml index 90baffd52..2d872f748 100644 --- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -30,7 +30,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: 'dmaap/messagerouter/msgrtr' project-name: 'dmaap-messagerouter-msgrtr' branch: 'master' diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index 71ca922b9..7620cca0c 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -17,7 +17,7 @@ maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' @@ -32,7 +32,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: externalapi-nbi-arm64 @@ -74,7 +74,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: 'externalapi/nbi' project-name: 'externalapi-nbi' branch: 'master' diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml index 0df129366..f78cce76a 100644 --- a/jjb/global-templates-c.yaml +++ b/jjb/global-templates-c.yaml @@ -84,7 +84,7 @@ name: '{project-name}-{stream}-docker-c-shell-daily' id: gerrit-docker-c-shell-daily <<: *c_job_common - node: 'ubuntu1604-docker-8c-8g' + node: 'ubuntu1804-docker-8c-8g' triggers: # 12 AM UTC diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml index 261515754..4d48b871f 100644 --- a/jjb/global-templates-golang.yaml +++ b/jjb/global-templates-golang.yaml @@ -157,7 +157,7 @@ name: '{project-name}-{stream}-docker-golang-shell-daily' golangver: 'golang110' project-type: freestyle - node: 'ubuntu1604-docker-8c-8g' + node: 'ubuntu1804-docker-8c-8g' disabled: false properties: - infra-properties: diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index bcf4bd3bb..7224b759e 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -815,7 +815,7 @@ name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily' project-type: freestyle - node: 'ubuntu1604-docker-8c-8g' + node: 'ubuntu1804-docker-8c-8g' disabled: '{disabled}' properties: - infra-properties: diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index 3f8816ea2..9b6824cbe 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -25,7 +25,7 @@ mvn-settings: 'holmes-common-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: holmes-common-sonar @@ -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: 'holmes/common' project-name: 'holmes-common' branch: 'master' diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index cb23377e8..f9c19be69 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -11,7 +11,7 @@ maven-versions-plugin: true - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g project: 'holmes/engine-management' @@ -23,7 +23,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: holmes-engine-management-sonar @@ -35,7 +35,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: 'holmes/engine-management' project-name: 'holmes-engine-management' branch: 'master' diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index 7e4342b68..347c6b75c 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -11,7 +11,7 @@ maven-versions-plugin: true - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g project: 'holmes/rule-management' @@ -23,7 +23,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: holmes-rule-management-sonar @@ -35,7 +35,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: 'holmes/rule-management' project-name: 'holmes-rule-management' branch: 'master' diff --git a/jjb/integration/emssimulator-swm-netconf_post.sh b/jjb/integration/emssimulator-swm-netconf_post.sh new file mode 100644 index 000000000..b69d3c0f8 --- /dev/null +++ b/jjb/integration/emssimulator-swm-netconf_post.sh @@ -0,0 +1,44 @@ +#!/bin/bash + +# Copyright 2020 Samsung Electronics Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +echo "---> emssimulator-swm-netconf_post.sh" + +set -e # Exit with zero only if all commands succeed + +SERVICE_NAME="ems-netconf-swm" +DOCKER_COMPOSE_LOG="/tmp/docker-compose.log" +DOCKER_COMPOSE_LOG_MSG=( "INFO success:" "entered RUNNING state" ) +DOCKER_COMPOSE_SLEEP_INTERVAL=4 + +pushd $DOCKER_ROOT + +# Dump container logs +sleep ${DOCKER_COMPOSE_SLEEP_INTERVAL} # Hang for a while so the services settle +docker-compose logs --no-color > ${DOCKER_COMPOSE_LOG} + +# Get the supervisord services running within container +supervisord_services=($(docker-compose exec -T ${SERVICE_NAME} /bin/sh -c \ + 'cat /etc/supervisord.conf /etc/supervisord.d/*' | grep -ho "program:[-a-zA-Z0-9]*" | cut -d: -f 2)) + +# Check all services are running and fail if not +for service in ${supervisord_services[@]}; +do + if ! grep -q "${DOCKER_COMPOSE_LOG_MSG[0]} $service ${DOCKER_COMPOSE_LOG_MSG[1]}" ${DOCKER_COMPOSE_LOG}; + then + echo "ERROR: Service $service is not running, failing the build." + exit 1 + fi +done diff --git a/jjb/integration/integration-docker-compose.yaml b/jjb/integration/integration-docker-compose.yaml new file mode 100644 index 000000000..ae840f6c6 --- /dev/null +++ b/jjb/integration/integration-docker-compose.yaml @@ -0,0 +1,22 @@ +--- +- project: + name: integration-docker-compose + project-name: 'integration' + project: 'integration' + stream: + - 'master': + branch: 'master' + jobs: + - '{project-name}-{stream}-{subproject}-docker-compose-verify': + script: | + #!/bin/bash + cd $DOCKER_ROOT + docker-compose up -d + subproject: + - 'netconf-pnp-simulator': + pattern: 'test/mocks/netconf-pnp-simulator/modules/**' + docker_root: 'test/mocks/netconf-pnp-simulator/modules' + - 'emssimulator-swm-netconf': + pattern: 'test/mocks/emssimulator/swm-netconf/**' + docker_root: 'test/mocks/emssimulator/swm-netconf' + post_script: !include-raw-escape: emssimulator-swm-netconf_post.sh diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml index 1d105d762..3062b0013 100644 --- a/jjb/integration/integration-docker.yaml +++ b/jjb/integration/integration-docker.yaml @@ -22,3 +22,25 @@ mvn-settings: 'integration-settings' files: '**' archive-artifacts: '' + +- project: + name: integration-netconf-pnp-simulator + project: integration + stream: + - 'master': + branch: 'master' + # Required by verifier + mvn-settings: 'integration-settings' + project-name: 'integration-netconf-pnp-simulator' + gerrit_trigger_file_paths: + - compare-type: ANT + pattern: 'test/mocks/netconf-pnp-simulator/engine/**' + docker-name: 'onap/integration/simulators/netconf-pnp-simulator' + docker-root: test/mocks/netconf-pnp-simulator/engine + container-tag-method: yaml-file + post_docker_build_script: !include-raw-escape: ../global-jjb/shell/tox-run.sh + build-node: centos7-docker-8c-8g + build-timeout: 20 + jobs: + - gerrit-docker-verify + - gerrit-docker-merge diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index aeb793f6f..99647507b 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -66,6 +66,11 @@ vagrant plugin install vagrant-disksize mkdir -p ~/.ssh +- builder: + name: integration-docker-compose-logs + builders: + - shell: !include-raw: shell/docker-compose-logs.sh + - publisher: name: integration-robot publishers: @@ -75,3 +80,16 @@ unstable-threshold: '{unstable-if}' pass-threshold: '{pass-if}' only-critical: false + +- publisher: + name: integration-docker-compose-logs + publishers: + - postbuildscript: + builders: + - role: BOTH + build-on: + - FAILURE + - SUCCESS + - UNSTABLE + build-steps: + - integration-docker-compose-logs diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml index 0bf309756..0ef7a5212 100644 --- a/jjb/integration/integration-templates-docker.yaml +++ b/jjb/integration/integration-templates-docker.yaml @@ -123,3 +123,49 @@ - infra-shiplogs: maven-version: '{maven-version}' + +- job-template: + name: '{project-name}-{stream}-{subproject}-docker-compose-verify' + project-type: freestyle + description: 'This job validates Docker Compose based projects' + node: 'ubuntu1804-docker-8c-8g' + docker_root: '$WORKSPACE' + post_script: '' + + parameters: + - lf-infra-parameters: + project: '{project}' + stream: '{stream}' + branch: '{branch}' + + properties: + - infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '{pattern}' + + builders: + - inject: + properties-content: | + DOCKER_ROOT={docker_root} + - shell: '{script}' + - shell: '{post_script}' + + publishers: + - integration-docker-compose-logs + - lf-infra-publish diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index ef112ea20..6e36576dd 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -78,28 +78,6 @@ branch: 'master' - project: - name: integration-netconf-pnp-simulator - project: integration - stream: - - 'master': - branch: 'master' - # Required by verifier - mvn-settings: 'integration-settings' - project-name: 'integration-netconf-pnp-simulator' - gerrit_trigger_file_paths: - - compare-type: ANT - pattern: 'test/mocks/netconf-pnp-simulator/engine/**' - docker-name: 'onap/integration/simulators/netconf-pnp-simulator' - docker-root: test/mocks/netconf-pnp-simulator/engine - container-tag-method: yaml-file - post_docker_build_script: !include-raw-escape: ../global-jjb/shell/tox-run.sh - build-node: centos7-docker-8c-8g - build-timeout: 20 - jobs: - - gerrit-docker-verify - - gerrit-docker-merge - -- project: name: integration-linters project: 'integration' project-name: 'integration' diff --git a/jjb/integration/simulators/integration-dc-simulator.yaml b/jjb/integration/simulators/integration-dc-simulator.yaml new file mode 100644 index 000000000..7d807dc8e --- /dev/null +++ b/jjb/integration/simulators/integration-dc-simulator.yaml @@ -0,0 +1,33 @@ +--- +- project: + name: integration-simulators-dc-simulator-info + project-name: integration-simulators-dc-simulator + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: integration/simulators/dc-simulator + branch: master + +- project: + name: integration-simulators-dc-simulator-linters + project: integration/simulators/dc-simulator + project-name: integration-simulators-dc-simulator + python-version: python3 + jobs: + - '{project-name}-{stream}-{subproject}-lint' + subproject: + - 'yaml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yaml' + - 'yml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yml' + - 'json': + tox-dir: '.' + tox-envs: 'json' + pattern: '**/*.json' + stream: + - 'master': + branch: 'master' diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml new file mode 100644 index 000000000..3e7c0f812 --- /dev/null +++ b/jjb/integration/simulators/integration-pnf-simulator.yaml @@ -0,0 +1,34 @@ +--- +- project: + name: integration-simulators-pnf-simulator-info + project-name: integration-simulators-pnf-simulator + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: integration/simulators/pnf-simulator + branch: master + +- project: + name: integration-simulators-pnf-simulator-linters + project: integration/simulators/pnf-simulator + project-name: integration-simulators-pnf-simulator + python-version: python3 + jobs: + - '{project-name}-{stream}-{subproject}-lint' + subproject: + - 'yaml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yaml' + - 'yml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yml' + - 'json': + tox-dir: '.' + tox-envs: 'json' + pattern: '**/*.json' + stream: + - 'master': + branch: 'master' + diff --git a/jjb/integration/usecases/integration-usecases-mdons.yaml b/jjb/integration/usecases/integration-usecases-mdons.yaml new file mode 100644 index 000000000..7f4d692ea --- /dev/null +++ b/jjb/integration/usecases/integration-usecases-mdons.yaml @@ -0,0 +1,33 @@ +--- +- project: + name: integration-usecases-mdons-info + project-name: integration-usecases-mdons + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: integration/usecases/mdons + branch: master + +- project: + name: integration-usecases-mdons-linters + project: integration/usecases/mdons + project-name: integration-usecases-mdons + python-version: python3 + jobs: + - '{project-name}-{stream}-{subproject}-lint' + subproject: + - 'yaml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yaml' + - 'yml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yml' + - 'json': + tox-dir: '.' + tox-envs: 'json' + pattern: '**/*.json' + stream: + - 'master': + branch: 'master' diff --git a/jjb/lf-infra-releasedockerhub.yaml b/jjb/lf-infra-releasedockerhub.yaml index ca2ea85b0..62d07a710 100644 --- a/jjb/lf-infra-releasedockerhub.yaml +++ b/jjb/lf-infra-releasedockerhub.yaml @@ -12,7 +12,7 @@ build-timeout: 90 project-type: freestyle - node: ubuntu1604-docker-8c-8g ## Probably don't need this much + node: ubuntu1804-docker-8c-8g ## Probably don't need this much disable-job: false disabled: '{disable-job}' diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml index f0eab70c1..085788f3f 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml @@ -10,7 +10,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - 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' mvn-params: '-Dmaven.test.skip=true -P docker' @@ -25,7 +25,7 @@ mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g maven-version: 'mvn35' #- project: @@ -57,7 +57,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: logging-analytics/pomba/pomba-aai-context-builder project-name: logging-analytics-pomba-pomba-aai-context-builder branch: master diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml index be776fffd..0130f17b7 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml @@ -18,7 +18,7 @@ mvn-settings: logging-analytics-pomba-pomba-audit-common-settings files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: logging-analytics-pomba-pomba-audit-common-sonar @@ -30,7 +30,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: logging-analytics/pomba/pomba-audit-common project-name: logging-analytics-pomba-pomba-audit-common branch: master diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml index 3f4f3cb9a..0fed02406 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml @@ -10,7 +10,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - 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' mvn-params: '-Dmaven.test.skip=true -P docker' @@ -24,7 +24,7 @@ mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g maven-version: 'mvn35' - project: @@ -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: logging-analytics/pomba/pomba-context-aggregator project-name: logging-analytics-pomba-pomba-context-aggregator branch: master diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml index 3f064c4ef..bc760c07b 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml @@ -10,7 +10,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - 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' mvn-params: '-Dmaven.test.skip=true -P docker' @@ -24,7 +24,7 @@ mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g maven-version: 'mvn35' #- project: @@ -57,7 +57,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: logging-analytics/pomba/pomba-network-discovery-context-builder project-name: logging-analytics-pomba-pomba-network-discovery-context-builder branch: master diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml index 41855fc17..17c419838 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml @@ -10,7 +10,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - 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' mvn-params: '-Dmaven.test.skip=true -P docker' @@ -24,7 +24,7 @@ mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g maven-version: 'mvn35' #- project: @@ -55,7 +55,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: logging-analytics/pomba/pomba-sdc-context-builder project-name: logging-analytics-pomba-pomba-sdc-context-builder branch: master diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml index 90126a0c5..4b94f803c 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml @@ -10,7 +10,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - 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' mvn-params: '-Dmaven.test.skip=true -P docker' @@ -24,7 +24,7 @@ mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder @@ -53,7 +53,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: 'H 11 * * *' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: logging-analytics/pomba/pomba-sdnc-context-builder project-name: logging-analytics-pomba-pomba-sdnc-context-builder branch: master diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index 159f3572d..8b6c39180 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.yaml @@ -31,7 +31,7 @@ files: '**' archive-artifacts: '' maven-version: "mvn35" - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: logging-analytics-arm64 @@ -63,7 +63,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: 'logging-analytics' project-name: 'logging-analytics' branch: 'master' diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index 3fc4d3326..f4d2365b1 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -16,7 +16,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-pom: 'distributions/msb-apigateway/pom.xml' container-public-registry: 'nexus3.onap.org:10001' @@ -31,7 +31,7 @@ mvn-settings: 'msb-apigateway-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: msb-apigateway-arm64 @@ -62,7 +62,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: 'msb/apigateway' project-name: 'msb-apigateway' branch: 'master' diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index cbe550524..84d75c87e 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -10,7 +10,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' @@ -25,7 +25,7 @@ mvn-settings: 'msb-discovery-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: msb-discovery-arm64 @@ -55,7 +55,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: 'msb/discovery' project-name: 'msb-discovery' branch: 'master' diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml index 9e37e1788..c7bb49ba9 100644 --- a/jjb/msb/msb-java-sdk.yaml +++ b/jjb/msb/msb-java-sdk.yaml @@ -16,7 +16,7 @@ mvn-settings: 'msb-java-sdk-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: msb-java-sdk-sonar @@ -28,7 +28,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: 'msb/java-sdk' project-name: 'msb-java-sdk' branch: 'master' diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml index 2f0c3e9f2..376cc1a47 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -16,7 +16,7 @@ mvn-settings: 'msb-swagger-sdk-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: msb-swagger-sdk-sonar @@ -28,7 +28,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: 'msb/swagger-sdk' project-name: 'msb-swagger-sdk' branch: 'master' diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml index 2995e7bfd..a5079c61e 100644 --- a/jjb/multicloud/multicloud-k8s.yaml +++ b/jjb/multicloud/multicloud-k8s.yaml @@ -26,7 +26,7 @@ mvn-settings: 'multicloud-k8s-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-8c-8g + build-node: ubuntu1804-builder-4c-4g #- project: # name: multicloud-k8s-arm64 diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml index 2f6015108..d5b030879 100644 --- a/jjb/music/music-distributed-kv-store.yaml +++ b/jjb/music/music-distributed-kv-store.yaml @@ -16,7 +16,7 @@ mvn-settings: 'music-distributed-kv-store-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: music-distributed-kv-store-info diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml index 496cd60cd..1450e9c16 100644 --- a/jjb/music/music-jar.yaml +++ b/jjb/music/music-jar.yaml @@ -27,7 +27,7 @@ mvn-settings: 'music-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: diff --git a/jjb/music/music-mdbc.yaml b/jjb/music/music-mdbc.yaml index 25773fb7b..5f2c15496 100644 --- a/jjb/music/music-mdbc.yaml +++ b/jjb/music/music-mdbc.yaml @@ -16,7 +16,7 @@ mvn-settings: 'music-mdbc-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml index 295a49ea2..93ffe4511 100644 --- a/jjb/music/music-prom.yaml +++ b/jjb/music/music-prom.yaml @@ -10,7 +10,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' @@ -24,7 +24,7 @@ mvn-settings: 'music-prom-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index b89c75079..fb7bdd8da 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -16,7 +16,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' @@ -32,7 +32,7 @@ mvn-settings: 'music-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: music-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: 'music' project-name: 'music' branch: 'master' diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml index 29d9422ad..5e96e1856 100644 --- a/jjb/oom/offline-installer.yaml +++ b/jjb/oom/offline-installer.yaml @@ -2,7 +2,7 @@ - project: name: offline-installer project-name: 'offline-installer' - build-node: 'ubuntu1604-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' offline_review_bootstrap: !include-raw-escape: offline-installer-review-bootstrap.sh stream: diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml index 1455f7f2f..8defb44ab 100644 --- a/jjb/oom/oom-oneclick-config.yaml +++ b/jjb/oom/oom-oneclick-config.yaml @@ -13,7 +13,7 @@ files: '**' archive-artifacts: '' build-timeout: 60 - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g submodule-recursive: true jobs: diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index d625aba44..fd35695ec 100644 --- a/jjb/oom/oom-registrator.yaml +++ b/jjb/oom/oom-registrator.yaml @@ -15,7 +15,7 @@ mvn-goals: 'install' script: !include-raw-escape: 'build-registrator-docker-image.sh' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g project: 'oom/registrator' @@ -25,7 +25,7 @@ mvn-settings: 'oom-registrator-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: oom-registrator-clm diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index fd76da2dc..aced94657 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -28,7 +28,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: oparent-clm diff --git a/jjb/openci/openci-onap-daily-jobs.yaml b/jjb/openci/openci-onap-daily-jobs.yaml index b956da779..03b9be801 100644 --- a/jjb/openci/openci-onap-daily-jobs.yaml +++ b/jjb/openci/openci-onap-daily-jobs.yaml @@ -25,7 +25,7 @@ concurrent: false - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g parameters: - string: @@ -71,7 +71,7 @@ concurrent: false - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g triggers: - jms-messaging: diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index 43b56a9a0..dca6674d6 100644 --- a/jjb/portal-sdk/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -24,12 +24,12 @@ stream: - 'master': branch: 'master' - - 'release-2.6.0': - branch: 'release-2.6.0' + - 'release-3.2.0': + branch: 'release-3.2.0' mvn-settings: 'portal-sdk-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: portal-sdk-sonar @@ -41,7 +41,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: 'portal/sdk' project-name: 'portal-sdk' branch: 'master' @@ -56,7 +56,7 @@ - gerrit-maven-clm: mvn-params: '-f ecomp-sdk/pom.xml' nexus-iq-namespace: 'onap-' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: portal/sdk project-name: 'portal-sdk' branch: 'master' diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml index a45188d52..04a637403 100644 --- a/jjb/portal/portal-docker.yaml +++ b/jjb/portal/portal-docker.yaml @@ -17,10 +17,12 @@ stream: - 'master': branch: 'master' + - 'release-3.2.0': + branch: 'release-3.2.0' mvn-settings: 'portal-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g extra-project: 'portal/sdk' extra-branch: '{branch}' extra-refspec: 'refs/heads/{branch}' diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index fa76df191..325d79ac4 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -21,10 +21,12 @@ stream: - 'master': branch: 'master' + - 'release-3.2.0': + branch: 'release-3.2.0' mvn-settings: 'portal-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g maven-deploy-properties: -Dbuild.number=$BUILD_NUMBER - project: @@ -37,7 +39,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: 'portal' project-name: 'portal' branch: 'master' @@ -51,7 +53,7 @@ - 'onap-gerrit-maven-coverity' cron: '@daily' max-git-repo-age-hours: 48 - build-node: 'ubuntu1604-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' project: 'portal' project-name: 'portal' branch: 'master' @@ -88,7 +90,7 @@ project: portal project-name: 'portal' branch: 'master' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g mvn-settings: 'portal-settings' - project: diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 1a6bdc416..af1be777c 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -36,7 +36,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: 'so/libs' project-name: 'so-libs' branch: 'master' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index cb7d0c93a..2de4db909 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -27,8 +27,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'so-settings' files: '**' archive-artifacts: '' @@ -102,4 +102,4 @@ build-node: centos7-builder-2c-1g project: so branch: master - branch: elalto + branch: frankfurt diff --git a/jjb/testsuite/testsuite-heatbridge.yaml b/jjb/testsuite/testsuite-heatbridge.yaml index 2c46a1560..77f8cb502 100644 --- a/jjb/testsuite/testsuite-heatbridge.yaml +++ b/jjb/testsuite/testsuite-heatbridge.yaml @@ -23,7 +23,7 @@ mvn-settings: 'testsuite-heatbridge-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: testsuite-heatbridge-master-clm @@ -32,7 +32,7 @@ nexus-iq-namespace: 'onap-' project: testsuite/heatbridge project-name: 'testsuite-heatbridge' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'testsuite-heatbridge-settings' diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 871876e75..a8668dcd9 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -32,7 +32,7 @@ mvn-settings: 'vid-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: vid-docker-arm64 @@ -60,7 +60,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: 'vid' project-name: 'vid' branch: 'master' @@ -75,7 +75,7 @@ nexus-iq-namespace: 'onap-' project: vid project-name: 'vid' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'vid-settings' diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml index 291011cab..5c7716f25 100644 --- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml +++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml @@ -21,7 +21,7 @@ - 'master': branch: 'master' mvn-settings: 'vnfsdk-dovetail-integration-settings' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-merge-java' @@ -31,7 +31,7 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g #- project: # name: vnfsdk-dovetail-integration-arm64 # project-name: 'vnfsdk-dovetail-integration-arm64' @@ -56,7 +56,7 @@ jobs: - gerrit-tox-sonar cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'vnfsdk/dovetail-integration' project-name: 'vnfsdk-dovetail-integration' branch: 'master' @@ -80,6 +80,6 @@ nexus-iq-namespace: 'onap-' project: vnfsdk/dovetail-integration project-name: 'vnfsdk-dovetail-integration' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'vnfsdk-dovetail-integration-settings' diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml index 3a29d4136..57e12fc19 100644 --- a/jjb/vnfsdk/vnfsdk-functest.yaml +++ b/jjb/vnfsdk/vnfsdk-functest.yaml @@ -17,7 +17,7 @@ mvn-settings: 'vnfsdk-functest-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: vnfsdk-functest-sonar @@ -29,7 +29,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: 'vnfsdk/functest' project-name: 'vnfsdk-functest' branch: 'master' @@ -53,6 +53,6 @@ nexus-iq-namespace: 'onap-' project: vnfsdk/functest project-name: 'vnfsdk-functest' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'vnfsdk-functest-settings' diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml index 7b2a77312..6d22310e6 100644 --- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml +++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml @@ -14,7 +14,7 @@ - 'master': branch: 'master' mvn-settings: 'vnfsdk-pkgtools-settings' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{subproject}-python-staging-{stream}' @@ -25,7 +25,7 @@ jobs: - gerrit-tox-sonar cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'vnfsdk/pkgtools' project-name: 'vnfsdk-pkgtools' branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index 947543548..addc36e30 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -10,10 +10,10 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + sign-artifacts: true + build-node: centos7-docker-8c-8g maven-versions-plugin: true - mvn-params: '-f vnfmarket-be/deployment/docker/docker-refrepo/pom.xml -P docker -Dmaven.test.skip=true -Dskip.docker.build=false -Dskip.docker.push=false -Dskip.docker.tag=false -Ddocker.push.registry=nexus3.onap.org:10003' - mvn-pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml' + mvn-goals: 'clean package -Pdocker -DpushImageTag' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -22,7 +22,7 @@ # docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml' # mvn-profile: 'docker' # mvn-params: '-Dmaven.test.skip=true' -# build-node: ubuntu1604-docker-8c-8g +# build-node: ubuntu1804-docker-8c-8g project: 'vnfsdk/refrepo' stream: - 'master': @@ -30,7 +30,7 @@ mvn-settings: 'vnfsdk-refrepo-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: vnfsdk-refrepo-arm64 @@ -63,7 +63,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: 'vnfsdk/refrepo' project-name: 'vnfsdk-refrepo' branch: 'master' @@ -87,6 +87,6 @@ nexus-iq-namespace: 'onap-' project: vnfsdk/refrepo project-name: 'vnfsdk-refrepo' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'vnfsdk-refrepo-settings' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index f5e7f43c2..3d5a602a1 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -18,7 +18,7 @@ mvn-settings: 'vnfsdk-validation-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: vnfsdk-validation-sonar @@ -30,7 +30,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: 'vnfsdk/validation' project-name: 'vnfsdk-validation' branch: 'master' @@ -54,6 +54,6 @@ nexus-iq-namespace: 'onap-' project: vnfsdk/validation project-name: 'vnfsdk-validation' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'vnfsdk-validation-settings' diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml index b0a6a2cd0..7d4191456 100644 --- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml +++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml @@ -31,7 +31,7 @@ mvn-settings: 'vnfsdk-ves-agent-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: vnfsdk-ves-agent-sonar @@ -54,7 +54,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: 'vnfsdk/ves-agent' project-name: 'vnfsdk-ves-agent' branch: 'master' @@ -80,6 +80,6 @@ nexus-iq-namespace: 'onap-' project: vnfsdk/ves-agent project-name: 'vnfsdk-ves-agent' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'vnfsdk-ves-agent-settings' diff --git a/jjb/vvp/pre-build-csv.sh b/jjb/vvp/pre-build-csv.sh index ef6fedc88..f17b3db3c 100644 --- a/jjb/vvp/pre-build-csv.sh +++ b/jjb/vvp/pre-build-csv.sh @@ -1,6 +1,6 @@ #!/bin/bash -virtualenv -p python3.6 $WORKSPACE/venv-tox +python3 -m venv $WORKSPACE/venv-tox source $WORKSPACE/venv-tox/bin/activate pip3 install --upgrade pip pip3 install --no-use-pep517 -r requirements.txt diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml index 9e2cc94a6..9f9b85e10 100644 --- a/jjb/vvp/vvp-validation-scripts.yaml +++ b/jjb/vvp/vvp-validation-scripts.yaml @@ -12,7 +12,7 @@ path: '.' pattern: '**' mvn-settings: 'vvp-validation-scripts-settings' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-docker-java-daily': @@ -32,7 +32,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'vvp/validation-scripts' project-name: 'vvp-validation-scripts' branch: 'master' @@ -44,7 +44,7 @@ name: vvp-validation-scripts-tracability-matrix project: 'vvp/validation-scripts' project-name: 'vvp-validation-scripts' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g mvn-settings: 'vvp-validation-scripts-settings' mvn-global-settings: 'global-settings' stream: |