Merge "Add jjbs for dcaegen2 mod projects"

diff --git a/global-jjb b/global-jjb
index aee2dcb..a2cfbc6 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit aee2dcb2ba92589124fbdfd9cd48cb29529063da
+Subproject commit a2cfbc66e675655ed0fb7d76862fdc044d96678d

diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml
deleted file mode 100644 (file)
index 4b10074..0000000
--- 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-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml
deleted file mode 100644 (file)
index cbce3ed..0000000
--- 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/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 6e690fa..e1ddf76 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -10,7 +10,8 @@
     project-name: 'ccsdk-apps'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index ea3d291..cc4c33d 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -4,7 +4,8 @@
     project-name: 'ccsdk-cds'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 104ebc4..eb72293 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -4,7 +4,8 @@
     project-name: 'ccsdk-distribution'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index a5df9d0..1b5abba 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -4,7 +4,8 @@
     project-name: 'ccsdk-features'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true

diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index cd04db7..38ed199 100644 (file)
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -6,6 +6,7 @@
       - gerrit-maven-verify
       - gerrit-maven-merge:
           cron: '@daily'
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true

diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 23480cf..c274881 100644 (file)
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -4,7 +4,8 @@
     project-name: 'ccsdk-sli-adaptors'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true

diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 9f41d4c..b84d3ae 100644 (file)
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -4,7 +4,8 @@
     project-name: 'ccsdk-sli-core'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true

diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 99116ce..ebcc368 100644 (file)
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -4,7 +4,8 @@
     project-name: 'ccsdk-sli-northbound'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
       - '{project-name}-gerrit-release-jobs':

diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index e4c7429..4eec8b2 100644 (file)
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -4,7 +4,8 @@
     project-name: 'ccsdk-sli-plugins'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true

diff --git a/jjb/clamp/dashboard/info-clamp-dashboard.yaml b/jjb/clamp/dashboard/info-clamp-dashboard.yaml
new file mode 100644 (file)
index 0000000..273b341
--- /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 (file)
index 0000000..64fa743
--- /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.yaml b/jjb/cli/cli.yaml
index 4963a09..25b06a8 100644 (file)
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -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/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
index bd13919..a3f690b 100644 (file)
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ b/jjb/dmaap/dmaap-dbcapi.yaml
@@ -12,6 +12,7 @@
 
     project: 'dmaap/dbcapi'
     mvn-settings: 'dmaap-dbcapi-settings'
+    java-version: openjdk11
     stream:
       - 'master':
           branch: 'master'
@@ -35,6 +36,7 @@
     mvn-settings: 'dmaap-dbcapi-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: dmaap-dbcapi-clm
@@ -45,6 +47,7 @@
     project-name: 'dmaap-dbcapi'
     branch: 'master'
     mvn-settings: 'dmaap-dbcapi-settings'
+    java-version: openjdk11
 
 - project:
     name: dmaap-dbcapi-info

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 9262dd6..67d3474 100644 (file)
--- 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 ac1ef40..538f117 100644 (file)
--- 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 60e0771..3ac5b25 100644 (file)
--- 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

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index d04ec6f..c4ae3aa 100644 (file)
--- 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-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 2274fe5..8949ed8 100644 (file)
--- 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: ''

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 1d38b69..93002e1 100644 (file)
--- 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 bacfce4..8822cec 100644 (file)
--- 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: ''

diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 3d811b7..1325ddb 100644 (file)
--- 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 a63971e..4f03585 100644 (file)
--- 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 ef6891c..dca2452 100644 (file)
--- 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

diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index 96bada6..7c376b7 100644 (file)
--- 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: ''