Merge "Add missing INFO verify for CCSDK"

diff --git a/global-jjb b/global-jjb
index e336456..f517210 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit e3364564e3f63cd337a5aafaadb483ba528ea4d2
+Subproject commit f5172109fc4ca477ad8e4764f41ef03f43fe0956

diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 16a7172..3d16d22 100644 (file)
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -49,6 +49,7 @@
           mvn-params: '-DskipTests'
           build-timeout: 60
           build-node: ubuntu1604-builder-8c-8g
+          mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
     nexus-iq-namespace: 'onap-'
     project: 'appc'
     project-name: 'appc'

diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 0ce35ee..dd788fa 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -15,6 +15,8 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
+    # used by tox-install.sh to specify the interpreter used to install tox
+    python-version: python3
     jobs:
       # clm and tox
       - '{project-name}-python-jobs'
@@ -38,6 +40,8 @@
     mvn-goals: 'clean test'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     branch: master
+    # used by tox-install.sh to specify the interpreter used to install tox
+    python-version: python3
     jobs:
       - gerrit-tox-sonar
 

diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index c9ab99f..dd4a4e4 100644 (file)
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -13,6 +13,8 @@
           mvn-goals: 'clean package -P docker docker:build docker:push'
           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: 'dmaap/datarouter'
     stream:

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index e245103..8c10af1 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -1,7 +1,7 @@
 ---
 - job-template:
     name: '{project-name}-{stream}-verify-csit-{functionality}'
-    disabled: false
+    disabled: '{disabled}'
 
     project-type: freestyle
     build-node: 'ubuntu1604-docker-8c-8g'
@@ -261,7 +261,7 @@
 
 - job-template:
     name: '{project-name}-{stream}-csit-{functionality}'
-    disabled: false
+    disabled: '{disabled}'
 
     project-type: freestyle
     build-node: 'ubuntu1604-docker-8c-8g'

diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml
index f981b21..496cd60 100644 (file)
--- a/jjb/music/music-jar.yaml
+++ b/jjb/music/music-jar.yaml
@@ -9,6 +9,13 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-version-plugin: true
+          mvn-pom: 'jar/pom.xml'
+          mvn-params: '-f jar/pom.xml'
+          pattern: 'jar/**'
     project: 'music'
     stream:
       - 'jar-master':

diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index a423fd6..152c303 100644 (file)
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -9,9 +9,15 @@
     subproject-name: 'onap-sdk'
 
     jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          mvn-pom: 'ecomp-sdk/pom.xml'
+          mvn-params: '-f ecomp-sdk/pom.xml'
+          pattern: 'ecomp-sdk/**'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-java-daily'
     project: 'portal/sdk'
     stream:
       - 'master':

diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 557962f..3ad86fc 100644 (file)
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.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-builder-4c-4g
 
     project: 'sdc/sdc-distribution-client'
     stream:

diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml
index e4551d7..c76685d 100644 (file)
--- a/jjb/so/so-csit.yaml
+++ b/jjb/so/so-csit.yaml
@@ -11,4 +11,6 @@
     functionality:
       - 'integration-testing':
           trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
+      - 'integration-etsi-testing':
+          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
     robot-options: ''