diff options
119 files changed, 878 insertions, 731 deletions
diff --git a/global-jjb b/global-jjb -Subproject 200c13dbad2552db1ba9cfc185b0dc40db86393 +Subproject a2cfbc66e675655ed0fb7d76862fdc044d96678 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-chameleon.yaml b/jjb/aai/aai-chameleon.yaml deleted file mode 100644 index 4b100749a..000000000 --- a/jjb/aai/aai-chameleon.yaml +++ /dev/null @@ -1,54 +0,0 @@ ---- -- project: - name: aai-chameleon-project-view - project-name: aai-chameleon - views: - - project-view - -- project: - name: aai-chameleon - project-name: 'aai-chameleon' - 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: 'package dockerfile:build dockerfile:push -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - 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/chameleon' - stream: - - 'elalto': - branch: 'elalto' - - 'master': - branch: 'master' - mvn-settings: 'aai-chameleon-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: - name: aai-chameleon-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/chameleon' - project-name: 'aai-chameleon' - stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-chameleon-settings' - -- project: - name: aai-chameleon-info - project-name: aai-chameleon - jobs: - - gerrit-info-yaml-verify - project: aai/chameleon - branch: master 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-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml deleted file mode 100644 index cbce3ed9b..000000000 --- a/jjb/aai/aai-gallifrey.yaml +++ /dev/null @@ -1,47 +0,0 @@ ---- -- project: - name: aai-gallifrey - project-name: 'aai-gallifrey' - 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: 'package dockerfile:build dockerfile:push -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - 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/gallifrey' - stream: - - 'elalto': - branch: 'elalto' - - 'master': - branch: 'master' - mvn-settings: 'aai-gallifrey-settings' - files: '**' - archive-artifacts: '' - -- project: - name: aai-gallifrey-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/gallifrey' - project-name: 'aai-gallifrey' - stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-gallifrey-settings' - -- project: - name: aai-gallifrey-info - project-name: aai-gallifrey - jobs: - - gerrit-info-yaml-verify - project: aai/gallifrey - branch: master 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..c69c670e0 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -9,11 +9,13 @@ name: ccsdk-apps project-name: 'ccsdk-apps' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + cron: '' - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -39,11 +41,18 @@ archive-artifacts: '' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: 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..410485950 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -3,12 +3,14 @@ name: ccsdk-cds project-name: 'ccsdk-cds' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true maven-versions-plugin: true + cron: '' - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -16,6 +18,7 @@ mvn-params: '-Dmaven.test.skip=true -P docker' maven-version: "mvn35" maven-versions-plugin: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -35,11 +38,18 @@ archive-artifacts: '' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: 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..727b6eef2 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -3,10 +3,12 @@ name: ccsdk-dashboard project-name: 'ccsdk-dashboard' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -25,11 +27,18 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-docker-8c-8g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: 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/distribution.yaml b/jjb/ccsdk/distribution.yaml index 104ebc476..aea76c6f1 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -3,12 +3,14 @@ name: ccsdk-distribution project-name: 'ccsdk-distribution' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true maven-versions-plugin: true + cron: '' - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -16,6 +18,7 @@ mvn-params: '-Dmaven.test.skip=true -P docker' maven-version: "mvn35" maven-versions-plugin: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g project: 'ccsdk/distribution' @@ -33,6 +36,8 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1604-docker-8c-8g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' #- project: diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index fbbab16ee..90837d7d1 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -3,11 +3,13 @@ name: ccsdk-features project-name: 'ccsdk-features' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -28,13 +30,20 @@ files: '**' archive-artifacts: '' maven-version: "mvn35" - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: 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 +51,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..3dcb72965 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -3,11 +3,13 @@ name: ccsdk-platform-plugins project-name: 'ccsdk-platform-plugins' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -26,11 +28,18 @@ files: '**' archive-artifacts: '' build-node: centos7-redis-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: 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..343051609 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -3,11 +3,13 @@ name: ccsdk-sli-adaptors project-name: 'ccsdk-sli-adaptors' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -29,11 +31,18 @@ archive-artifacts: '' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: 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..868151aa9 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -3,11 +3,13 @@ name: ccsdk-sli-core project-name: 'ccsdk-sli-core' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -29,11 +31,18 @@ archive-artifacts: '' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: 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..73ea82386 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -3,10 +3,12 @@ name: ccsdk-sli-northbound project-name: 'ccsdk-sli-northbound' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -29,11 +31,18 @@ archive-artifacts: '' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: 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..71ce51b60 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -3,11 +3,13 @@ name: ccsdk-sli-plugins project-name: 'ccsdk-sli-plugins' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -29,11 +31,18 @@ archive-artifacts: '' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: 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/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 03350a881..7b49b60a9 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -3,11 +3,13 @@ name: ccsdk-utils project-name: 'ccsdk-utils' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -23,6 +25,8 @@ deployAtEnd=true files: '**' archive-artifacts: '' + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: name: ccsdk-utils-clm diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index 8b96a2af4..7d3fd7868 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -16,6 +16,7 @@ - centos-7 - ubuntu-16.04 - ubuntu-16.04-arm64 + - ubuntu-18.04 templates: builder - project: diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index c2f2d5f34..b3dae54ef 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -44,6 +44,11 @@ jobs: - gerrit-maven-sonar: mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' + 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-docker-8c-8g project: 'clamp' 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 792f70d6f..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' @@ -60,6 +60,11 @@ name: cli-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: 'cli' 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-platform-adapter.yaml b/jjb/dcaegen2/dcaegen2-platform-adapter.yaml index bb0a9f73b..a203a7577 100644 --- a/jjb/dcaegen2/dcaegen2-platform-adapter.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-adapter.yaml @@ -32,8 +32,10 @@ name: dcaegen2-platform-aoadapter # root of docker build docker-root: adapter/acumos + # tag override + docker-get-container-tag-script: ../../shell/docker-ts-tag-override.sh # image name - docker-name: '{name}' + docker-name: 'onap/{name}' stream: - master: branch: master @@ -58,3 +60,15 @@ jobs: - gerrit-tox-sonar cron: '@daily' + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-aoadapter-clm + docker-root: adapter/acumos + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project-name: 'dcaegen2-platform-aoadapter-clm' + mvn-params: '-f adapter/acumos/pom.xml' + branch: 'master' + diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-distributorapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-distributorapi.yaml new file mode 100644 index 000000000..1210edbdc --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod-distributorapi.yaml @@ -0,0 +1,45 @@ +--- +# dcagen2_platform_common is defined in dcaegen2-platform-adapter.yaml + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-mod-distributorapi + # root of docker build + docker-root: mod/distributorapi + # image name + docker-name: '{name}' + stream: + - master: + branch: master + jobs: + - '{project-name}-gerrit-docker-jobs' + +- project: + <<: *dcaegen2_platform_common + name: dcagen2-platform-mod-distributorapi-verify + docker-root: mod/distributorapi + stream: + - all: + branch: '*' + jobs: + - gerrit-tox-verify + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-mod-distributorapi-sonar + docker-root: mod/distributorapi + branch: master + jobs: + - gerrit-tox-sonar + cron: '@daily' + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-mod-distributorapi-clm + docker-root: mod/distributorapi + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project-name: 'dcaegen2-platform-mod-distributorapi-clm' + mvn-params: '-f mod/distributorapi/pom.xml' + branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-onboardingapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-onboardingapi.yaml new file mode 100644 index 000000000..ca63a42cc --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod-onboardingapi.yaml @@ -0,0 +1,45 @@ +--- +# dcagen2_platform_common is defined in dcaegen2-platform-adapter.yaml + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-mod-onboardingapi + # root of docker build + docker-root: mod/onboardingapi + # image name + docker-name: '{name}' + stream: + - master: + branch: master + jobs: + - '{project-name}-gerrit-docker-jobs' + +- project: + <<: *dcaegen2_platform_common + name: dcagen2-platform-mod-onboardingapi-verify + docker-root: mod/onboardingapi + stream: + - all: + branch: '*' + jobs: + - gerrit-tox-verify + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-mod-onboardingapi-sonar + docker-root: mod/onboardingapi + branch: master + jobs: + - gerrit-tox-sonar + cron: '@daily' + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-mod-onboardingapi-clm + docker-root: mod/onboardingapi + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project-name: 'dcaegen2-platform-mod-onboardingapi-clm' + mvn-params: '-f mod/onboardingapi/pom.xml' + branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod.yaml b/jjb/dcaegen2/dcaegen2-platform-mod.yaml new file mode 100644 index 000000000..1baf6c0a8 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod.yaml @@ -0,0 +1,8 @@ +--- + +- project: + name: dcaegen2-platform-mod-project-view + project-name: dcaegen2-platform-mod + views: + - project-view + diff --git a/jjb/dcaegen2/dcaegen2-platform-oti-eventhandler.yaml b/jjb/dcaegen2/dcaegen2-platform-oti-eventhandler.yaml new file mode 100644 index 000000000..fa64115f6 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-oti-eventhandler.yaml @@ -0,0 +1,45 @@ +--- +# dcagen2_platform_common is defined in dcaegen2-platform-adapter.yaml + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-oti-event-handler + # root of docker build + docker-root: oti/event-handler + # image name + docker-name: '{name}' + stream: + - master: + branch: master + jobs: + - '{project-name}-gerrit-docker-jobs' + +- project: + <<: *dcaegen2_platform_common + name: dcagen2-platform-oti-event-handler-verify + docker-root: oti/event-handler + stream: + - all: + branch: '*' + jobs: + - gerrit-tox-verify + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-oti-event-handler-sonar + docker-root: oti/event-handler + branch: master + jobs: + - gerrit-tox-sonar + cron: '@daily' + +- project: + <<: *dcaegen2_platform_common + name: dcaegen2-platform-oti-event-handler-clm + docker-root: oti/event-handler + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project-name: 'dcaegen2-platform-oti-event-handler-clm' + mvn-params: '-f oti/event-handler/pom.xml' + branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml new file mode 100644 index 000000000..d29517123 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml @@ -0,0 +1,80 @@ +--- +- project: + name: dcaegen2-platform-oti-event-proc + project-name: dcaegen2-platform-oti + # git repo + project: dcaegen2/platform + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java': + mvn-goals: 'clean install' + subproject: + - eventproc: + pom: 'oti/event-proc/pom.xml' + pattern: 'oti/event-proc/**' + stream: + - 'master': + branch: 'master' + mvn-settings: dcaegen2-platform-settings + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-8c-8g + +- project: + name: dcaegen2-platform-oti-event-proc-release + project: 'dcaegen2/platform' + project-name: 'dcaegen2-platform-oti-event-proc' + jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + version-properties-file: 'oti/event-proc/version.properties' + mvn-pom: 'oti/event-proc/pom.xml' + mvn-params: '-f oti/event-proc/pom.xml' + mvn-goals: 'clean deploy -Ddockerfile.skip -f oti/event-proc/pom.xml' + pattern: 'oti/event-proc/**' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + mvn-goals: 'clean package dockerfile:build dockerfile:push -f oti/event-proc/pom.xml' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + pattern: 'oti/event-proc/**' + + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' + +- project: + name: dcaegen2-platform-oti-event-proc-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'dcaegen2/platform' + project-name: 'dcaegen2-platform-oti-event-proc' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + mvn-params: '-f oti/event-proc/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + + +- project: + name: dcaegen2-platform-oti-event-proc-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + build-node: ubuntu1604-docker-8c-8g + project: 'dcaegen2/platform' + project-name: dcaegen2-platform-oti-event-proc-clm + mvn-params: '-f oti/event-proc/pom.xml' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + 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-java.yaml deleted file mode 100644 index fed43a65f..000000000 --- a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-java.yaml +++ /dev/null @@ -1,73 +0,0 @@ ---- -- 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' - jobs: - - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g - maven-versions-plugin: true - version-properties-file: 'components/pm-subscription-handler/version.properties' - mvn-pom: 'components/pm-subscription-handler/pom.xml' - mvn-goals: 'clean deploy -f components/pm-subscription-handler/pom.xml' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - pattern: 'components/pm-subscription-handler/**' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - 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-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - 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-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-pm-subscription-handler.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml new file mode 100644 index 000000000..7a845453f --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml @@ -0,0 +1,81 @@ +--- +- dcaegen2_services_common: &dcaegen2_services_common + # values apply to all dcaegen2_services docker projects + name: dcaegen2-services-docker-common + project: dcaegen2/services + # maven settings file has docker credentials + mvn-settings: dcaegen2-services-settings + # use host network to clone from our gerrit + container-tag-method: latest + build-node: ubuntu1604-docker-8c-8g + # jenkins job name prefix + project-name: '{name}' + tox-dir: '{docker-root}' + # build only on relevant changes + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: '{docker-root}/.*' + +- project: + <<: *dcaegen2_services_common + name: dcaegen2-services-pmsh + # root of docker build + docker-root: components/pm-subscription-handler + # tag override + # Following is dependent on merge https://gerrit.onap.org/r/#/c/ci-management/+/99313/ + # docker-get-container-tag-script: '../../shell/docker-ts-tag-override.sh' + # image name + docker-name: 'onap/{name}' + stream: + - master: + branch: master + jobs: + - gerrit-docker-verify + - gerrit-docker-merge + +- project: + <<: *dcaegen2_services_common + name: dcaegen2-services-pmsh-verify + docker-root: components/pm-subscription-handler + stream: + - all: + branch: '*' + jobs: + - gerrit-tox-verify + +- project: + <<: *dcaegen2_services_common + name: dcaegen2-services-pmsh-sonar + docker-root: components/pm-subscription-handler + branch: master + jobs: + - gerrit-tox-sonar + cron: '@daily' + +- project: + <<: *dcaegen2_services_common + docker-root: components/pm-subscription-handler + name: dcaegen2-services-pmsh-release + project-name: dcaegen2-services-pmsh-release + jobs: + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + stream: + - 'master': + branch: master + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + +- project: + <<: *dcaegen2_services_common + name: dcaegen2-services-pmsh-clm + docker-root: components/pm-subscription-handler + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project-name: 'dcaegen2-services-pmsh-clm' + mvn-params: '-f components/pm-subscription-handler/pom.xml' + branch: 'master' + 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/demo/demo.yaml b/jjb/demo/demo.yaml index 49eea2892..fffa81d26 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -32,6 +32,11 @@ name: demo-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: 'demo' diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index bd1391931..94cc44be8 100644 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -9,9 +9,12 @@ 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: 'dmaap/dbcapi' mvn-settings: 'dmaap-dbcapi-settings' + java-version: openjdk11 stream: - 'master': branch: 'master' @@ -35,6 +38,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 +49,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..47fcf39e6 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 @@ -66,6 +67,11 @@ name: externalapi-nbi-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: 'externalapi/nbi' 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-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index ec988621f..6a51fc5a3 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -54,6 +54,11 @@ name: msb-apigateway-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: 'msb/apigateway' 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/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index 3e2fe170f..149238e1e 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -47,6 +47,11 @@ name: msb-discovery-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: 'msb/discovery' diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml index 436719324..579f4635b 100644 --- a/jjb/msb/msb-java-sdk.yaml +++ b/jjb/msb/msb-java-sdk.yaml @@ -22,6 +22,11 @@ name: msb-java-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: 'msb/java-sdk' diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml index 8e5a1ce67..09426a2a9 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -22,6 +22,11 @@ name: msb-swagger-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: 'msb/swagger-sdk' 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-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml index 7ac4fca90..b8bf8a1a4 100644 --- a/jjb/multicloud/multicloud-azure-java.yaml +++ b/jjb/multicloud/multicloud-azure-java.yaml @@ -57,6 +57,11 @@ name: multicloud-azure-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: 'multicloud/azure' diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 388f94c30..d5e24d205 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -62,6 +62,11 @@ name: multicloud-framework-multivimbroker-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: 'multicloud/framework' @@ -87,6 +92,11 @@ name: multicloud-framework-artifactbroker-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: 'multicloud/framework' 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-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index c29787214..205d374a1 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -59,6 +59,11 @@ name: multicloud-openstack-vmware-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: 'multicloud/openstack/vmware' 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/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index da9605fe6..eefdc7721 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -96,6 +96,11 @@ name: multicloud-openstack-windriver-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: 'multicloud/openstack' @@ -110,6 +115,11 @@ name: multicloud-openstack-pike-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: 'multicloud/openstack' @@ -124,6 +134,11 @@ name: multicloud-openstack-starlingx-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: 'multicloud/openstack' @@ -149,6 +164,11 @@ name: multicloud-openstack-fcaps-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: 'multicloud/openstack' @@ -163,6 +183,11 @@ # name: multicloud-openstack-lenovo-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: 'multicloud/openstack' 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-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 9262dd6c7..67d3474dd 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -31,8 +31,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-apex-pdp-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index ac1ef4089..538f1170d 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-api-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 60e077121..ec7d7834d 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -16,9 +16,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-common-settings' + java-version: openjdk11 files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g @@ -38,6 +37,7 @@ project-name: 'policy-common' branch: 'master' mvn-settings: 'policy-common-settings' + java-version: openjdk11 mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -50,6 +50,7 @@ project-name: 'policy-common' branch: 'master' mvn-settings: 'policy-common-settings' + java-version: openjdk11 - project: name: policy-common-info diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index d04ec6fd1..c4ae3aa24 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-distribution-settings' files: '**' archive-artifacts: '' 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/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 2274fe5fb..905958d69 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-drools-applications-settings' files: '**' archive-artifacts: '' @@ -59,6 +57,7 @@ project-name: 'policy-drools-applications' branch: 'master' mvn-settings: 'policy-drools-applications-settings' + build-node: ubuntu1604-docker-8c-8g - project: name: policy-drools-applications-info diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 1d38b6960..93002e186 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-drools-pdp-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index bacfce4d7..d1d113e16 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-engine-settings' files: '**' archive-artifacts: '' @@ -48,7 +46,7 @@ branch: 'master' mvn-settings: 'policy-engine-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m' - project: name: policy-engine-clm diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index 3d811b754..1325ddb74 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-models-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index a63971e94..4f0358525 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-pap-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index ef6891cce..86a532662 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -16,9 +16,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-parent-settings' + java-version: openjdk11 files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g @@ -32,6 +31,7 @@ project-name: 'policy-parent' branch: 'master' mvn-settings: 'policy-parent-settings' + java-version: openjdk11 - project: name: policy-parent-info diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 96bada63f..7c376b77b 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'policy-xacml-pdp-settings' files: '**' archive-artifacts: '' 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..882796ad2 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -9,17 +9,20 @@ name: sdnc-apps project-name: 'sdnc-apps' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g + cron: '' - gerrit-maven-docker-stage: build-node: ubuntu1604-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' maven-version: "mvn35" + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -42,11 +45,18 @@ archive-artifacts: '' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: 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..20665a3a0 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -3,11 +3,13 @@ name: sdnc-northbound project-name: 'sdnc-northbound' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -30,11 +32,18 @@ archive-artifacts: '' maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' - project: 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/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index d74810537..563f47469 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -4,12 +4,14 @@ name: sdnc-oam project-name: 'sdnc-oam' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + cron: '' - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -17,6 +19,7 @@ mvn-params: '-Dmaven.test.skip=true -P docker' maven-version: "mvn35" maven-versions-plugin: true + cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g project: 'sdnc/oam' @@ -32,6 +35,8 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' # #- project: 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/vid/vid.yaml b/jjb/vid/vid.yaml index b0845fd71..bc4b64d23 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -54,6 +54,11 @@ name: vid-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: 'vid' diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml index 30a1de50f..583b7b670 100644 --- a/jjb/vnfsdk/vnfsdk-functest.yaml +++ b/jjb/vnfsdk/vnfsdk-functest.yaml @@ -23,6 +23,11 @@ name: vnfsdk-functest-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: 'vnfsdk/functest' 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/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index db4954b68..53efe1788 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -57,6 +57,11 @@ name: vnfsdk-refrepo-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: 'vnfsdk/refrepo' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 17092438e..b3a664f20 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -22,6 +22,11 @@ name: vnfsdk-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: 'vnfsdk/validation' diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml index 8bcbd0b11..52751aace 100644 --- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml +++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml @@ -48,6 +48,11 @@ make-opts: -j6 stream: master build-node: centos7-builder-4c-4g + 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: 'vnfsdk/ves-agent' diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml index a9280815f..c15615081 100644 --- a/packer/provision/local-builder.yaml +++ b/packer/provision/local-builder.yaml @@ -6,6 +6,12 @@ become_method: sudo tasks: + - 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 +25,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 +37,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: diff --git a/shell/docker-ts-tag-override.sh b/shell/docker-ts-tag-override.sh new file mode 100755 index 000000000..e14d2e5a9 --- /dev/null +++ b/shell/docker-ts-tag-override.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +# ================================================================================ +# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= + +set -feu -o pipefail + +echo "--> docker-ts-tag-override.sh" + +# Get project version from pom.xml +version=`xmllint --xpath "//*[local-name()='project']/*[local-name()='version']/text()" $DOCKER_ROOT/pom.xml` +echo "INFO: version from pom file $version" + +# Some pom has -SNAPSHOT or -STAGING under pom version, remove all text +version="${version//[^0-9.]/}" + +# Get build TS for specifying in the tag +timestamp=$(date +%C%y%m%dT%H%M%SZ) + +# Following the https://wiki.onap.org/display/DW/Independent+Versioning+and+Release+Process +# IndependentVersioningandReleaseProcess-StandardizedDockerTagging +# ONAP Tag requirement : {imagename}:{semver}-SNAPSHOT-{timestamp}Z (from CIMAN-132) + +if [[ $version =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + tag="${version}-SNAPSHOT-${timestamp}" +else + # Default to latest tag with TS if not conforming to semantic versioning + echo "WARN: version not complaint to sem-ver; tag defaulted to latest" + version=latest + tag="${version}-${timestamp}" +fi + +echo "INFO: docker tag is $tag" + +# Write DOCKER_IMAGE_TAG information to a file so it can be +# injected into the environment for following steps +echo "DOCKER_IMAGE_TAG=$tag" >> "$WORKSPACE/env_docker_inject.txt" |