Merge "Migrate MODELING to SonarCloud"

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

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg
index 8f57b1d..fb013cd 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-helm-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - helm -  - 20190925-211723.485
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - helm -  - 20200124-210936.289
 LABELS=ubuntu1604-helm-2c-1g
 HARDWARE_ID=v2-highcpu-2

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 174f529..7e31d9a 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -22,6 +22,7 @@
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
+          cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 7e6645d..d237148 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -18,7 +18,7 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
           maven-versions-plugin: true
-          cron: ''
+          cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 8e9c9ac..015e0a1 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -18,7 +18,7 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
           maven-versions-plugin: true
-          cron: ''
+          cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'ccsdk/distribution'

diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 81c70d1..886949f 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -35,7 +35,7 @@
           pattern: 'components/datalake-handler/**'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
-          mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/pom.xml'
+          mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/feeder/pom.xml'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           pattern: 'components/datalake-handler/**'

diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
index d044ba1..21a8ba5 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-docker.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml
@@ -10,6 +10,8 @@
           maven-versions-plugin: true
           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: 'dmaap/messagerouter/messageservice'
     stream:
       - 'master':

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 10b713e..b7b92fd 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -7,6 +7,7 @@
     build-node: 'ubuntu1604-docker-8c-8g'
     node: '{build-node}'
     recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
@@ -43,6 +44,8 @@
           files: '**/{project-name}/**'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -66,6 +69,7 @@
     build-node: 'ubuntu1604-docker-arm64-4c-2g'
     node: '{build-node}'
     recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
@@ -102,6 +106,8 @@
           files: '**/{project-name}/**'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -125,6 +131,7 @@
     build-node: 'ubuntu1604-docker-8c-8g'
     node: '{build-node}'
     recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
@@ -165,6 +172,8 @@
           files: '**/{project-name}/**'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -206,6 +215,7 @@
     build-node: 'ubuntu1604-docker-arm64-4c-2g'
     node: '{build-node}'
     recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
@@ -246,6 +256,8 @@
           files: '**/{project-name}/**'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -287,6 +299,7 @@
     build-node: 'ubuntu1604-docker-8c-8g'
     node: '{build-node}'
     recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
@@ -326,6 +339,8 @@
           jobs: '{obj:trigger_jobs}'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -349,6 +364,7 @@
     build-node: 'ubuntu1604-docker-arm64-4c-2g'
     node: '{build-node}'
     recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
@@ -388,6 +404,8 @@
           jobs: '{obj:trigger_jobs}'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -411,6 +429,7 @@
     build-node: 'ubuntu1604-docker-8c-8g'
     node: '{build-node}'
     recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
@@ -454,6 +473,8 @@
           jobs: '{obj:trigger_jobs}'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -495,6 +516,7 @@
     build-node: 'ubuntu1604-docker-arm64-4c-2g'
     node: '{build-node}'
     recipients: ''
+    java-version: 'openjdk11'
 
     properties:
       - lf-infra-properties:
@@ -538,6 +560,8 @@
           jobs: '{obj:trigger_jobs}'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'

diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index b099e82..b4ba623 100644 (file)
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -34,6 +34,8 @@
       - 'elalto':
           branch: 'elalto'
     mvn-settings: 'optf-cmso-settings'
+    java-version: openjdk11
+
     subproject:
       - 'cmso':
           path: '.'
@@ -58,6 +60,7 @@
     mvn-settings: 'optf-cmso-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: optf-cmso-clm
@@ -74,6 +77,7 @@
       - 'elalto':
           branch: 'elalto'
     mvn-settings: 'optf-cmso-settings'
+    java-version: openjdk11
 
 - project:
     name: optf-cmso-info

diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
new file mode 100644 (file)
index 0000000..8ec46fc
--- /dev/null
+++ b/jjb/policy/policy-gui.yaml
@@ -0,0 +1,70 @@
+---
+- project:
+    name: policy-gui
+    project-name: 'policy-gui'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-params: '-P docker'
+          build-node: ubuntu1604-docker-4c-4g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-4c-4g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
+
+    project: 'policy/gui'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'policy-gui-settings'
+    java-version: openjdk11
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: policy-gui-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: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'policy/gui'
+    project-name: 'policy-gui'
+    branch: 'master'
+    mvn-settings: 'policy-gui-settings'
+    java-version: openjdk11
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: policy-gui-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: policy/gui
+    project-name: 'policy-gui'
+    branch: 'master'
+    mvn-settings: 'policy-gui-settings'
+    java-version: openjdk11
+
+- project:
+    name: policy-gui-info
+    project-name: policy-gui
+    jobs:
+      - gerrit-info-yaml-verify
+    project: policy/gui
+    branch: master

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 1d3b37e..8a8c6b4 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -35,6 +35,7 @@
           mvn-profile: 'docker'
           mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
       - gerrit-maven-stage:
+          build-timeout: 90
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index f796934..5775377 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -22,7 +22,7 @@
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
-          cron: ''
+          cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 38c6061..53d26e3 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -19,7 +19,7 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
           maven-versions-plugin: true
-          cron: ''
+          cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'sdnc/oam'

diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml
index e3b8086..daed681 100644 (file)
--- a/packer/provision/helm.yaml
+++ b/packer/provision/helm.yaml
@@ -7,7 +7,7 @@
 
   vars:
     kubectl_version: 1.11.2
-    helm_version: 2.9.1
+    helm_version: 2.12.3
 
   tasks:
     - name: 'Install kubectl {{kubectl_version}}'