Merge "Update PMSH sonor jjb job"

diff --git a/global-jjb b/global-jjb
index f098976..2100921 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit f09897651a64bbfa1d3424ca58d09cbb2af382cf
+Subproject commit 21009213aa6204bfb40eedc1b11f89a259abd917

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 0515a51..5f10f9a 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -21,9 +21,9 @@
     stream:
       - 'master':
           branch: 'master'
+          mvn-params: '-P spring-boot-2-1'
       - 'elalto':
           branch: 'elalto'
-    mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -44,6 +44,7 @@
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
     branch: 'master'
+    mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -60,6 +61,7 @@
     stream:
       - 'master':
           branch: 'master'
+    mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
 
@@ -88,6 +90,7 @@
       - 'master':
           branch: 'master'
           distro: 'alpine'
+          mvn-params: '-P spring-boot-2-1'
     docker_name: 'onap/aai-common-{distro}'
     docker_build_args: '-f ./Dockerfile.{distro}'
     docker_root: '$WORKSPACE/Dockerfiles/aai-common/'
@@ -102,6 +105,7 @@
     build-node: ubuntu1604-docker-8c-8g
     jobs:
       - gerrit-whitesource-scan
+    mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-aai-common-settings'
     wss-product-name: 'aai'
     mvn-clean-install: true

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 25f4782..2a9c7c1 100644 (file)
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -28,6 +28,7 @@
           branch: 'elalto'
       - 'master':
           branch: 'master'
+          mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-model-loader-settings'
     files: '**'
     archive-artifacts: ''
@@ -47,6 +48,7 @@
     project: 'aai/model-loader'
     project-name: 'aai-model-loader'
     branch: 'master'
+    mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-model-loader-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -61,6 +63,7 @@
     stream:
       - 'master':
           branch: 'master'
+    mvn-params: '-P spring-boot-2-1'
     mvn-settings: 'aai-model-loader-settings'
 
 - project:
@@ -70,6 +73,7 @@
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
     project: aai/model-loader
+    mvn-params: '-P spring-boot-2-1'
     branch: master
 
 - project:
@@ -79,6 +83,7 @@
     jobs:
       - gerrit-whitesource-scan
     mvn-settings: 'aai-model-loader-settings'
+    mvn-params: '-P spring-boot-2-1'
     wss-product-name: 'aai'
     mvn-clean-install: true
     project: 'aai/model-loader'

diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 779c9e3..b94302f 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -6,6 +6,8 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'dcaegen2/collectors/snmptrap'
     stream:

diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 9b8b581..78d12ee 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -23,6 +23,8 @@
       # build docker image
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-release-verify
+      - gerrit-release-merge
     stream:
       - master:
           branch: master

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
index 859badc..d7a8a6f 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
@@ -8,6 +8,7 @@
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
+          project-name: dcaegen2-platform-mod-bpgenerator
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
index 2402dd0..4cced95 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
@@ -8,6 +8,9 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java':
           mvn-goals: 'clean install'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+          project-name: dcaegen2-platform-mod-designtool
     subproject:
       - designtool:
           pom: 'mod/designtool/pom.xml'

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
index f3ad499..513df2f 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
@@ -8,6 +8,9 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java':
           mvn-goals: 'clean install'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+          project-name: dcaegen2-platform-mod-genprocessor
     subproject:
       - genprocessor:
           pom: 'mod/genprocessor/pom.xml'

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
index cdfd3c6..ed11903 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
@@ -8,6 +8,9 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java':
           mvn-goals: 'clean install'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+          project-name: dcaegen2-platform-mod-runtimeapi
     subproject:
       - runtimeapi:
           pom: 'mod/runtimeapi/pom.xml'

diff --git a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml
index c38e1c8..e5825be 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml
@@ -8,6 +8,10 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java':
           mvn-goals: 'clean install'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+          project-name: dcaegen2-platform-oti-event-proc
+
     subproject:
       - eventproc:
           pom: 'oti/event-proc/pom.xml'

diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
index 81444df..d2487dd 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
@@ -7,6 +7,9 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java':
           mvn-goals: 'clean install'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+          project-name: dcaegen2-services-bbs-event-processor
     subproject:
       - 'bbs-event-processor':
           pom: 'components/bbs-event-processor/pom.xml'

diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 93e4608..7d86a1e 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -6,6 +6,9 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+
     subproject:
       - 'datalake-handler':
           pom: 'components/datalake-handler/pom.xml'

diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index bbf5b88..e9c8531 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -6,6 +6,8 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'dcaegen2/services/heartbeat'
     stream:

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
index 3eb5989..20dcad4 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
@@ -1,6 +1,7 @@
 - project:
     name: dcaegen2-services-pmsh-csit
     jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: dcaegen2-services-pmsh
     recipients: 'lego@est.tech'
@@ -8,7 +9,7 @@
       - 'master':
           branch: 'master'
     functionality:
-      - 'testsuites':
+      - 'testsuite':
           trigger_jobs:
             - '{project-name}-{stream}-release-version-java-daily'
     robot-options: ''

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 5775377..39a8977 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -30,10 +30,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-      - 'elalto-fluorine':
-          branch: 'elalto-fluorine'
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be

diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 7c7094f..85293ea 100644 (file)
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -17,10 +17,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-      - 'elalto-fluorine':
-          branch: 'elalto-fluorine'
     mvn-settings: 'sdnc-northbound-settings'
 
     # due to a strange macro / variable translation problem this needs to be

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 53d26e3..c39db40 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -26,15 +26,12 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-      - 'elalto-fluorine':
-          branch: 'elalto-fluorine'
     mvn-settings: 'sdnc-oam-settings'
     maven-version: "mvn35"
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+    shallow-clone: true
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 

diff --git a/jjb/sdnc/sdnc-oom.yaml b/jjb/sdnc/sdnc-oom.yaml
index 1a02f8f..1ab6862 100644 (file)
--- a/jjb/sdnc/sdnc-oom.yaml
+++ b/jjb/sdnc/sdnc-oom.yaml
@@ -13,8 +13,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
 
     mvn-settings: 'sdnc-oom-settings'
     files: '**'

diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index 273e377..0483624 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -32,6 +32,7 @@
 
 - project:
     name: vfc-nfvo-driver-sfc-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true

diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 9fa63c6..8beb8d4 100644 (file)
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -24,6 +24,7 @@
 
 - project:
     name: vfc-nfvo-resmanagement-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true

diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index c156150..a9b0bd6 100644 (file)
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -54,21 +54,25 @@
           - libxml-xpath-perl
           - wget
           - make
-          - npm
           - sshuttle
           - netcat
           - libssl-dev
           - libffi-dev
-      become: true
-      when: ansible_distribution == 'Ubuntu'
-
-    - name: Install autorelease support packages
-      apt:
-        name:
           - xmlstarlet
           - xvfb
           - crudini
           - maven
           - python-ncclient
+          - xmlstarlet
+          - xvfb
+          - crudini
+          - maven
+          - python-ncclient
+          - nodejs-dev
+          - node-gyp
+          - libssl1.0-dev
+          - nodejs
+          - npm
+        update_cache: yes
       become: true
       when: ansible_distribution == 'Ubuntu'

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 7b9f9c0..6c114b5 100644 (file)
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -108,22 +108,26 @@
           - libxml-xpath-perl
           - wget
           - make
-          - npm
           - sshuttle
           - netcat
           - libssl-dev
           - libffi-dev
-      become: true
-      when: ansible_distribution == 'Ubuntu'
-
-    - name: Install autorelease support packages
-      apt:
-        name:
           - xmlstarlet
           - xvfb
           - crudini
           - maven
           - python-ncclient
+          - xmlstarlet
+          - xvfb
+          - crudini
+          - maven
+          - python-ncclient
+          - nodejs-dev
+          - node-gyp
+          - libssl1.0-dev
+          - nodejs
+          - npm
+        update_cache: yes
       become: true
       when: ansible_distribution == 'Ubuntu'