Merge "Migrate MSB to SonarCloud"
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index c2f2d5f..b3dae54 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/dcaegen2/dcaegen2-platform-adapter.yaml b/jjb/dcaegen2/dcaegen2-platform-adapter.yaml
index ef56413..a203a75 100644
--- a/jjb/dcaegen2/dcaegen2-platform-adapter.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-adapter.yaml
@@ -60,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
index b8387d0..1210edb 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-distributorapi.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-distributorapi.yaml
@@ -32,3 +32,14 @@
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
index ffe5640..ca63a42 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-onboardingapi.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-onboardingapi.yaml
@@ -32,3 +32,14 @@
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-oti-eventhandler.yaml b/jjb/dcaegen2/dcaegen2-platform-oti-eventhandler.yaml
new file mode 100644
index 0000000..fa64115
--- /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 0000000..d295171
--- /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/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index 4c69d4c..47fcf39 100644
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -67,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/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 3ac5b25..ec7d783 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -37,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'
@@ -49,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-parent.yaml b/jjb/policy/policy-parent.yaml
index dca2452..86a5326 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -31,6 +31,7 @@
project-name: 'policy-parent'
branch: 'master'
mvn-settings: 'policy-parent-settings'
+ java-version: openjdk11
- project:
name: policy-parent-info