diff options
79 files changed, 352 insertions, 548 deletions
diff --git a/global-jjb b/global-jjb -Subproject 200c13dbad2552db1ba9cfc185b0dc40db86393 +Subproject aee2dcb2ba92589124fbdfd9cd48cb29529063d diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg index 29067e85f..56786f77e 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20191106-004821.547 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20191127-235551.406 LABELS=ubuntu1604-docker-8c-8g HARDWARE_ID=v2-highcpu-8 diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index 5531462a6..fb5c8a702 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -60,6 +60,11 @@ name: aaf-authz-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aaf/authz' diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml index 7d61e587f..8ce051273 100644 --- a/jjb/aaf/aaf-cadi.yaml +++ b/jjb/aaf/aaf-cadi.yaml @@ -21,6 +21,11 @@ name: aaf-cadi-shiro-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aaf/cadi' @@ -52,6 +57,11 @@ name: aaf-cadi-fproxy-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aaf/cadi' @@ -83,6 +93,11 @@ name: aaf-cadi-rproxy-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aaf/cadi' diff --git a/jjb/aaf/aaf-csit.yaml b/jjb/aaf/aaf-csit.yaml deleted file mode 100644 index 1b25747ea..000000000 --- a/jjb/aaf/aaf-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: aaf-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'aaf' - stream: 'master' - disabled: true - functionality: - - 'aafapi': - trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' - robot-options: '' - branch: 'master' diff --git a/jjb/aaf/aaf-sms-csit.yaml b/jjb/aaf/aaf-sms-csit.yaml deleted file mode 100644 index 5b08c55a4..000000000 --- a/jjb/aaf/aaf-sms-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- - - project: - name: aaf-sms-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'aaf' - stream: 'master' - disabled: true - functionality: - - 'sms-test-plan': - trigger_jobs: 'aaf-sms-master-docker-golang-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 090b70f2f..ff9c5f887 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -33,6 +33,11 @@ name: aai-aai-common-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/aai-common' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 9affc4540..1b9fd761a 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -37,6 +37,11 @@ name: aai-babel-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/babel' diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml index 079d8d63c..599563476 100644 --- a/jjb/aai/aai-cacher.yaml +++ b/jjb/aai/aai-cacher.yaml @@ -32,6 +32,11 @@ name: aai-cacher-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/cacher' diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml deleted file mode 100644 index d2358fd58..000000000 --- a/jjb/aai/aai-champ.yaml +++ /dev/null @@ -1,67 +0,0 @@ ---- -- project: - name: aai-champ-project-view - project-name: aai-champ - views: - - project-view - -- project: - name: aai-champ - project-name: 'aai-champ' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - mvn-params: '-Pdocker -Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'aai/champ' - stream: - - 'master': - branch: 'master' - - 'elalto': - branch: 'elalto' - mvn-settings: 'aai-champ-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: - name: aai-champ-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'aai/champ' - project-name: 'aai-champ' - branch: 'master' - mvn-settings: 'aai-champ-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: aai-champ-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/champ' - project-name: 'aai-champ' - stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-champ-settings' - -- project: - name: aai-champ-info - project-name: aai-champ - jobs: - - gerrit-info-yaml-verify - project: aai/champ - branch: master diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml deleted file mode 100644 index 0b3abdfff..000000000 --- a/jjb/aai/aai-csit.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- project: - name: aai-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'aai' - disabled: true - stream: - - 'master': - branch: master - functionality: - - 'resources': - trigger_jobs: 'aai-resources-{stream}-aai-docker-java-daily' - - 'traversal': - trigger_jobs: 'aai-traversal-{stream}-aai-docker-java-daily' - - 'esr-server': - trigger_jobs: 'aai-esr-server-{stream}-docker-java-daily' - robot-options: '' diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index 596ce36e0..8f5ff60dd 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -36,6 +36,11 @@ name: aai-data-router-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/data-router' diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index 2c9d99674..016c80471 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -39,6 +39,11 @@ name: aai-esr-server-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/esr-server' diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index 497443b60..db026cf62 100644 --- a/jjb/aai/aai-event-client.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -31,6 +31,11 @@ name: aai-event-client-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/event-client' diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml deleted file mode 100644 index aa720a71c..000000000 --- a/jjb/aai/aai-gizmo.yaml +++ /dev/null @@ -1,67 +0,0 @@ ---- -- project: - name: aai-gizmo-project-view - project-name: aai-gizmo - views: - - project-view - -- project: - name: aai-gizmo - project-name: 'aai-gizmo' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - mvn-params: '-P docker -B -Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'aai/gizmo' - stream: - - 'elalto': - branch: 'elalto' - - 'master': - branch: 'master' - mvn-settings: 'aai-gizmo-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: - name: aai-gizmo-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'aai/gizmo' - project-name: 'aai-gizmo' - branch: 'master' - mvn-settings: 'aai-gizmo-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: aai-gizmo-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/gizmo' - project-name: 'aai-gizmo' - stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-gizmo-settings' - -- project: - name: aai-gizmo-info - project-name: aai-gizmo - jobs: - - gerrit-info-yaml-verify - project: aai/gizmo - branch: master diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 4356ef0aa..2accf9930 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -38,6 +38,11 @@ name: aai-graphadmin-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/graphadmin' diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index 0fa173750..67b3b9454 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -44,6 +44,11 @@ name: aai-graphgraph-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/graphgraph' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 4bb5bf432..22a6628e7 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -31,6 +31,11 @@ name: aai-logging-service-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/logging-service' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 0acc6b4ec..e6eca29d3 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -37,6 +37,11 @@ name: aai-model-loader-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/model-loader' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index da8611dc8..9dac98eb1 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -38,6 +38,11 @@ name: aai-resources-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/resources' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 9777b6bf9..b7ee32972 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -31,6 +31,11 @@ name: aai-rest-client-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/rest-client' diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index 58a5fb888..e4eaab9a3 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -31,6 +31,11 @@ name: aai-router-core-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/router-core' diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 2be085bef..0361dbb78 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -38,6 +38,11 @@ name: aai-schema-service-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/schema-service' diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index 8bce774d0..b8d335312 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -55,6 +55,11 @@ name: aai-search-data-service-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/search-data-service' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 12182e31d..140873392 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -36,6 +36,11 @@ name: aai-sparky-be-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/sparky-be' diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index 83875bf91..9283edf9d 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -33,6 +33,11 @@ name: aai-sparky-fe-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/sparky-fe' diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml deleted file mode 100644 index c6d0ed585..000000000 --- a/jjb/aai/aai-spike.yaml +++ /dev/null @@ -1,66 +0,0 @@ ---- -- project: - name: aai-spike-project-view - project-name: aai-spike - views: - - project-view - -- project: - name: aai-spike - project-name: 'aai-spike' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - mvn-params: '-P docker -B -Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'aai/spike' - stream: - - 'elalto': - branch: 'elalto' - - 'master': - branch: 'master' - mvn-settings: 'aai-spike-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: - name: aai-spike-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'aai/spike' - project-name: 'aai-spike' - branch: 'master' - mvn-settings: 'aai-spike-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: aai-spike-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/spike' - project-name: 'aai-spike' - stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-spike-settings' - -- project: - name: aai-spike-info - project-name: aai-spike - jobs: - - gerrit-info-yaml-verify - project: aai/spike - branch: master diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 5e0a8e44a..cd58d6a73 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -38,6 +38,11 @@ name: aai-traversal-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/traversal' diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml index 689c6f706..db0ec41fa 100644 --- a/jjb/aai/aai-validation.yaml +++ b/jjb/aai/aai-validation.yaml @@ -37,6 +37,11 @@ name: aai-validation-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'aai/validation' diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index d2c0c4b6b..1730afd8b 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -34,6 +34,11 @@ name: appc-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-8c-8g project: 'appc' diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index c62fb3b7d..6e690fa51 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -44,6 +44,11 @@ name: ccsdk-apps-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'ccsdk/apps' diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index 885329c2c..ea3d2915b 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -40,6 +40,11 @@ name: ccsdk-cds-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'ccsdk/cds' diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index 5fb77b03d..298afa2fe 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -30,6 +30,11 @@ name: ccsdk-dashboard-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: centos7-redis-4c-4g project: 'ccsdk/dashboard' diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index fbbab16ee..a5df9d0af 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -35,6 +35,11 @@ name: ccsdk-features-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'ccsdk/features' @@ -42,7 +47,7 @@ branch: 'master' mvn-settings: 'ccsdk-features-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m' maven-version: "mvn35" - project: diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index f4830c1d6..e344e88ef 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -31,6 +31,11 @@ name: ccsdk-platform-plugins-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: centos7-redis-4c-4g project: 'ccsdk/platform/plugins' diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index bb05ee387..23480cf27 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -34,6 +34,11 @@ name: ccsdk-sli-adaptors-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'ccsdk/sli/adaptors' diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index a6415b6d1..9f41d4ca7 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -34,6 +34,11 @@ name: ccsdk-sli-core-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'ccsdk/sli/core' diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 54de27aff..99116ceb5 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -34,6 +34,11 @@ name: ccsdk-sli-northbound-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'ccsdk/sli/northbound' diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index e08c8d0e7..e4c7429bb 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -34,6 +34,11 @@ name: ccsdk-sli-plugins-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'ccsdk/sli/plugins' diff --git a/jjb/clamp/dashboard/info-clamp-dashboard.yaml b/jjb/clamp/dashboard/info-clamp-dashboard.yaml new file mode 100644 index 000000000..273b34128 --- /dev/null +++ b/jjb/clamp/dashboard/info-clamp-dashboard.yaml @@ -0,0 +1,8 @@ +--- +- project: + name: clamp-dashboard-info + project-name: clamp-dashboard + jobs: + - gerrit-info-yaml-verify + project: clamp/dashboard + branch: master diff --git a/jjb/clamp/ui/info-clamp-ui.yaml b/jjb/clamp/ui/info-clamp-ui.yaml new file mode 100644 index 000000000..64fa74309 --- /dev/null +++ b/jjb/clamp/ui/info-clamp-ui.yaml @@ -0,0 +1,8 @@ +--- +- project: + name: clamp-ui-info + project-name: clamp-ui + jobs: + - gerrit-info-yaml-verify + project: clamp/ui + branch: master diff --git a/jjb/cli/cli-csit.yaml b/jjb/cli/cli-csit.yaml deleted file mode 100644 index 7438b8689..000000000 --- a/jjb/cli/cli-csit.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- project: - name: cli-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'cli' - disabled: true - stream: - - 'master': - branch: 'master' - functionality: - - 'sanity-check': - trigger_jobs: - robot-options: '' - branch: 'master' diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index bc8aadd42..25b06a889 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -17,7 +17,7 @@ maven-versions-plugin: true - gerrit-maven-docker-stage: sign-artifacts: true - build-node: ubuntu1604-docker-8c-8g + build-node: centos7-docker-8c-8g maven-versions-plugin: true mvn-params: '-Dskip.docker.build=false -Dskip.docker.push=false -Dskip.docker.tag=false -Ddocker.push.registry=nexus3.onap.org:10003' container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/dcaegen2/dcaegen2-analytics-flink.yaml b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml new file mode 100644 index 000000000..c98abc9ee --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml @@ -0,0 +1,8 @@ +--- +- project: + name: dcaegen2-analytics-flink-info + project-name: dcaegen2-analytics-flink + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/analytics/flink + branch: master diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml new file mode 100644 index 000000000..452bd56fe --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-analytics.yaml @@ -0,0 +1,8 @@ +--- +- project: + name: dcaegen2-analytics-info + project-name: dcaegen2-analytics + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/analytics + branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 4f51f2bf7..fc12da490 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -2,6 +2,7 @@ - project: name: dcaegen2-collectors-ves project-name: 'dcaegen2-collectors-ves' + java-version: openjdk11 jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml new file mode 100644 index 000000000..35e25921a --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-collectors.yaml @@ -0,0 +1,8 @@ +--- +- project: + name: dcaegen2-collectors-info + project-name: dcaegen2-collectors + jobs: + - gerrit-info-yaml-verify + project: dcaegen2/collectors + branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml index 955b1f774..3eb59891b 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml @@ -1,16 +1,14 @@ - project: name: dcaegen2-services-pmsh-csit jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' - project-name: 'dcaegen2-services-pmsh' + project-name: dcaegen2-services-pmsh recipients: 'lego@est.tech' - disabled: true stream: - 'master': branch: 'master' functionality: - 'testsuites': trigger_jobs: - - '{project-name}-{stream}-pmsh-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily' robot-options: '' diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-java.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml index fed43a65f..7839270ee 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml @@ -1,29 +1,8 @@ --- - project: - name: dcaegen2-services-pmsh - project: 'dcaegen2/services' - project-name: 'dcaegen2-services' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - subproject: - - 'pmsh': - pom: 'components/pm-subscription-handler/pom.xml' - pattern: 'components/pm-subscription-handler/**' - stream: - - 'master': - branch: 'master' - mvn-settings: 'dcaegen2-services-settings' - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' - -- project: name: dcaegen2-services-pmsh-release - project: 'dcaegen2/services' - project-name: 'dcaegen2-services-pmsh' + project: dcaegen2/services + project-name: dcaegen2-services-pmsh-release jobs: - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g @@ -38,36 +17,59 @@ build-node: centos7-docker-8c-8g stream: - 'master': - branch: 'master' - mvn-settings: 'dcaegen2-services-settings' + branch: master + mvn-settings: dcaegen2-services-settings + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-8c-8g + +- project: + name: dcaegen2-services-pmsh + project: dcaegen2/services + project-name: dcaegen2-services + tox-dir: components/pm-subscription-handler/ + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'components/pm-subscription-handler/**' + subproject: + - 'pmsh': + pom: 'components/pm-subscription-handler/pom.xml' + pattern: 'components/pm-subscription-handler/**' + mvn-settings: dcaegen2-services-settings maven-deploy-properties: | deployAtEnd=true files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' + build-node: ubuntu1604-docker-8c-8g + # used by tox-install.sh to specify the interpreter used to install tox + python-version: python3 + jobs: + # clm and tox + - '{project-name}-python-jobs' + # build docker image + - '{project-name}-{stream}-{subproject}-merge-java' + stream: + - master: + branch: master - project: name: dcaegen2-services-pmsh-sonar + python-version: python3 + tox-dir: components/pm-subscription-handler/ + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'components/pm-subscription-handler/**' jobs: - - gerrit-maven-sonar + - gerrit-tox-sonar cron: '@daily' - build-node: 'ubuntu1604-builder-4c-4g' - project: 'dcaegen2/services' - project-name: 'dcaegen2-services-pmsh' - branch: 'master' - mvn-settings: 'dcaegen2-services-settings' + build-node: ubuntu1604-builder-4c-4g + project: dcaegen2/services + project-name: dcaegen2-services-pmsh + branch: master + mvn-settings: dcaegen2-services-settings mvn-params: '-f components/pm-subscription-handler/pom.xml' - mvn-goals: 'clean install' + mvn-goals: 'clean test' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' -- project: - name: dcaegen2-services-pmsh-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - build-node: 'ubuntu1604-docker-8c-8g' - project: 'dcaegen2/services' - project-name: 'dcaegen2-services-pmsh' - mvn-params: '-f components/pm-subscription-handler/pom.xml' - branch: 'master' - mvn-settings: 'dcaegen2-services-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index 0da5dd2b1..5d3e2e28e 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -3,13 +3,14 @@ name: dcaegen2-services-sdk project-name: 'dcaegen2-services-sdk' jobs: - - '{project-name}-{stream}-verify-java': - build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true" + - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: - sign-aftifacts: true + sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'dcaegen2/services/sdk' stream: @@ -27,7 +28,8 @@ - project: name: dcaegen2-services-sdk-integration-pairwise jobs: - - '{project-name}-{stream}-integration-pairwise' + - '{project-name}-{stream}-integration-pairwise': + build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true" build-node: ubuntu1604-docker-8c-8g project: 'dcaegen2/services/sdk' project-name: 'dcaegen2-services-sdk' @@ -35,8 +37,7 @@ - 'master': branch: 'master' mvn-settings: 'dcaegen2-services-sdk-settings' - mvn-goals: 'clean install' - mvn-opts: ' -P integration-pairwise' + mvn-params: ' -P integration-pairwise' - project: name: dcaegen2-services-sdk-sonar diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index bd1391931..a3f690b71 100644 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -12,6 +12,7 @@ project: 'dmaap/dbcapi' mvn-settings: 'dmaap-dbcapi-settings' + java-version: openjdk11 stream: - 'master': branch: 'master' @@ -35,6 +36,7 @@ mvn-settings: 'dmaap-dbcapi-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: dmaap-dbcapi-clm @@ -45,6 +47,7 @@ project-name: 'dmaap-dbcapi' branch: 'master' mvn-settings: 'dmaap-dbcapi-settings' + java-version: openjdk11 - project: name: dmaap-dbcapi-info diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index 9ab7df977..c91b6c430 100644 --- a/jjb/doc/doc.yaml +++ b/jjb/doc/doc.yaml @@ -8,6 +8,7 @@ - project: name: doc project-name: 'doc' + python-version: python3 jobs: - '{project-name}-{stream}-verify-rtd': build-node: centos7-docker-8c-8g diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index 66bb307f2..4c69d4cca 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -29,6 +29,7 @@ - 'master': branch: 'master' mvn-settings: 'externalapi-nbi-settings' + java-version: openjdk11 files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/holmes/holmes-csit.yaml b/jjb/holmes/holmes-csit.yaml deleted file mode 100644 index bf7e768a9..000000000 --- a/jjb/holmes/holmes-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: holmes-rule-management-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'holmes-rule-management' - stream: 'master' - disabled: true - functionality: - - 'sanity-check': - trigger_jobs: 'holmes-rule-management-master-docker-java-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/msb/msb-csit.yaml b/jjb/msb/msb-csit.yaml deleted file mode 100644 index 42a665727..000000000 --- a/jjb/msb/msb-csit.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- project: - name: msb-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'msb' - stream: 'master' - disabled: true - functionality: - - 'sanity-check': - trigger_jobs: - - 'rest-service': - trigger_jobs: - - 'tcp-service': - trigger_jobs: - - 'iag-redirect-discovery': - trigger_jobs: - robot-options: '' - branch: 'master' diff --git a/jjb/multicloud/multicloud-azure-csit.yaml b/jjb/multicloud/multicloud-azure-csit.yaml deleted file mode 100644 index 3deb163b9..000000000 --- a/jjb/multicloud/multicloud-azure-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: multicloud-azure-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'multicloud-azure' - stream: 'master' - disabled: true - functionality: - - 'functionality1': - trigger_jobs: 'multicloud-azure-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/multicloud/multicloud-k8s-csit.yaml b/jjb/multicloud/multicloud-k8s-csit.yaml deleted file mode 100644 index 28027b813..000000000 --- a/jjb/multicloud/multicloud-k8s-csit.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- project: - name: multicloud-k8s-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'multicloud-k8s' - recipients: 'bin.yang@windriver.com' - stream: 'master' - disabled: true - functionality: - - 'functionality1': - trigger_jobs: 'multicloud-k8s-master-docker-golang-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-pike-csit.yaml b/jjb/multicloud/multicloud-openstack-pike-csit.yaml deleted file mode 100644 index 90bc92785..000000000 --- a/jjb/multicloud/multicloud-openstack-pike-csit.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -- project: - name: multicloud-openstack-pike-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'multicloud-pike' - recipients: 'bin.yang@windriver.com' - stream: 'master' - disabled: true - functionality: - - 'functionality1': - trigger_jobs: - - 'multicloud-openstack-master-docker-java-version-shell-daily' -# - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml deleted file mode 100644 index 14eb87adf..000000000 --- a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: multicloud-openstack-windriver-csit - jobs: - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'multicloud-windriver' - recipients: 'bin.yang@windriver.com' - stream: 'master' - disabled: true - functionality: - - 'functionality1': - trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/music/music-csit.yaml b/jjb/music/music-csit.yaml deleted file mode 100644 index 22148b369..000000000 --- a/jjb/music/music-csit.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- project: - name: music-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'music' - recipients: 'bharathb@research.att.com' - disabled: true - stream: 'master' - functionality: - - 'music-test-plan': - trigger_jobs: 'music-master-docker-version-java-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index 5bbaae3ca..a4ac621f6 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -38,6 +38,11 @@ name: music-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'music' diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml index caf4de5a4..3bee2b146 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -45,6 +45,11 @@ jobs: - gerrit-maven-sonar: mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001 -DskipIntegrationTests=false' + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: 'H 11 * * *' build-node: ubuntu1604-docker-8c-8g project: 'optf/cmso' diff --git a/jjb/optf/optf-fgps.yaml b/jjb/optf/optf-fgps.yaml index 6367d62bc..7c5718abb 100644 --- a/jjb/optf/optf-fgps.yaml +++ b/jjb/optf/optf-fgps.yaml @@ -85,6 +85,11 @@ name: optf-fgps-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'optf/fgps' diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml deleted file mode 100644 index 57bc512b2..000000000 --- a/jjb/optf/optf-has-csit.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- project: - name: optf-has-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'optf-has' - disabled: true - stream: - - 'master': - branch: master - - 'dublin': - branch: dublin - functionality: - - 'has': - trigger_jobs: 'optf-has-master-conductor-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 902539815..f08d7f997 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -73,6 +73,11 @@ name: optf-has-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'optf/has' diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml deleted file mode 100644 index 337d77500..000000000 --- a/jjb/optf/optf-osdf-csit.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -- project: - name: optf-osdf-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'optf-osdf' - recipients: 'snarayanan@research.att.com' - disabled: true - stream: - - 'master': - branch: master - functionality: - - 'osdf': - trigger_jobs: 'optf-osdf-master-osdf-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index a9463ffbd..d5bcf23e4 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -71,6 +71,11 @@ name: optf-osdf-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'optf/osdf' diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index df914f71c..63daef949 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -85,24 +85,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: policy-docker-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'policy/docker' - project-name: 'policy-docker' - branch: 'master' - mvn-settings: 'policy-docker-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: name: policy-docker-clm jobs: - gerrit-maven-clm diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index f15dfc0d5..c01fd31b6 100644 --- a/jjb/portal-sdk/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -35,6 +35,11 @@ name: portal-sdk-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'portal/sdk' diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index 0fcb0a572..5bc1697d7 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -28,6 +28,11 @@ name: portal-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'portal' diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml index b3670e232..5b7955c99 100644 --- a/jjb/sdc/sdc-sdc-be-common.yaml +++ b/jjb/sdc/sdc-sdc-be-common.yaml @@ -15,6 +15,8 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'sdc/sdc-be-common' stream: - 'master': diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index edb5b90a8..2de80e0dc 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -47,6 +47,11 @@ name: sdnc-apps-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'sdnc/apps' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index d7d816d5f..507d04496 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -35,6 +35,11 @@ name: sdnc-northbound-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'sdnc/northbound' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml deleted file mode 100644 index 3fb23ac79..000000000 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- project: - name: vfc-nfvo-driver-vnfm-svnfm-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-driver-vnfm-svnfm' - recipients: 'yangyanyj@chinamobile.com' - disabled: true - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-nfvo-driver-vnfm-svnfm-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml deleted file mode 100644 index 621571cb5..000000000 --- a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -- project: - name: vfc-nfvo-wfengine-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-wfengine' - recipients: 'yangyanyj@chinamobile.com' - disabled: true - stream: 'master' - functionality: - - 'sanity-check' - trigger_jobs: - - 'vfc-nfvo-wfengine-master-engine-activiti-extension-docker-java-version-shell-daily' - - 'vfc-nfvo-wfengine-master-engine-mgr-service-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml deleted file mode 100644 index a0679bbd5..000000000 --- a/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: vnfsdk-pkgtools-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vnfsdk-pkgtools' - disabled: true - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: - robot-options: '' - branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml deleted file mode 100644 index 9ff4e8509..000000000 --- a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: vnfsdk-refrepo-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vnfsdk-refrepo' - stream: 'master' - disabled: true - functionality: - - 'sanity-check': - trigger_jobs: '{project-name}-{stream}-merge-java' - robot-options: '' - branch: 'master' diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml index a9280815f..10c3c407e 100644 --- a/packer/provision/local-builder.yaml +++ b/packer/provision/local-builder.yaml @@ -6,6 +6,18 @@ become_method: sudo tasks: + - apt_repository: + repo: ppa:jonathonf/python-3.6 + state: present + become: true + when: ansible_distribution == 'Ubuntu' + + - apt_repository: + repo: ppa:deadsnakes/ppa + state: present + become: true + when: ansible_distribution == 'Ubuntu' + - name: Update and upgrade apt packages apt: upgrade: yes @@ -19,12 +31,6 @@ state: present become: true - - apt_repository: - repo: ppa:jonathonf/python-3.6 - state: present - become: true - when: ansible_distribution == 'Ubuntu' - - name: Install Python 3.6 and packages apt: name: @@ -37,6 +43,15 @@ become: true when: ansible_distribution == 'Ubuntu' + - name: Install Python 3.7 + apt: + name: + - python3.7 + - python3.7-dev + - python3.7-tk + become: true + when: ansible_distribution == 'Ubuntu' + - name: Install base packages apt: name: diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index 76e0cbbd1..c3c9f1731 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -72,6 +72,12 @@ become: true when: ansible_distribution == 'Ubuntu' + - apt_repository: + repo: ppa:deadsnakes/ppa + state: present + become: true + when: ansible_distribution == 'Ubuntu' + - name: Update and upgrade apt packages apt: upgrade: yes @@ -91,6 +97,15 @@ become: true when: ansible_distribution == 'Ubuntu' + - name: Install Python 3.7 + apt: + name: + - python3.7 + - python3.7-dev + - python3.7-tk + become: true + when: ansible_distribution == 'Ubuntu' + - name: Install base packages apt: name: |