Merge "Add dmaap-datarouter elalto jenkins jobs"

diff --git a/global-jjb b/global-jjb
index 3b12327..200c13d 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 3b12327f7116727b4c19a8465589869a6add032b
+Subproject commit 200c13dbad2552db1ba9cfc185b0dc40db863930

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
index 201ae92..a542419 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190912-234852.235
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190926-155906.553
 LABELS=centos7-builder-2c-1g
 HARDWARE_ID=v2-highcpu-2

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
index 4be9cf2..c583dd8 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190912-234852.235
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190926-155906.553
 LABELS=centos7-builder-4c-4g
 HARDWARE_ID=v2-highcpu-4

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
index e19e146..1829cfe 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190912-234755.337
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20190926-164302.295
 LABELS=centos7-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg
index 6289286..d757901 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=CentOS 7 - memcached -  - 70880808-8008
+IMAGE_NAME=CentOS 7 - memcached -  - 260980909-9003
 LABELS=centos7-memcached-4c-4g
 HARDWARE_ID=v2-highcpu-4

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
index b8b74a8..88b7dc1 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=CentOS 7 - redis -  - 100680606-6010
+IMAGE_NAME=CentOS 7 - redis -  - 260980909-9003
 LABELS=centos7-redis-4c-4g
 HARDWARE_ID=v2-highcpu-4

diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
index b3c72a2..75014db 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190510-225520.575
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190925-220639.261
 LABELS=queue-docker-4c-4g
 HARDWARE_ID=v2-highcpu-4
 INSTANCE_CAP=1

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg
index 29b2cd0..ede8fe0 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190925-225237.394
 LABELS=ubuntu1604-builder-2c-1g
 HARDWARE_ID=v2-highcpu-2

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg
index 8780f95..6b2727b 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190925-225237.394
 LABELS=ubuntu1604-builder-4c-2g
 HARDWARE_ID=v2-highcpu-4

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg
index 4337baf..93ccf7c 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=Ubuntu 16.04 - basebuild - 20180319-1943
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190925-225237.394
 LABELS=ubuntu1604-builder-4c-4g
 HARDWARE_ID=v2-highcpu-4

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg
index a01f336..e8dac37 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190604-095324.721
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20190925-225237.394
 LABELS=ubuntu1604-builder-8c-8g
 HARDWARE_ID=v2-highcpu-8

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
index c36428e..225e5c4 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190905-215402.663
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190925-220639.261
 LABELS=ubuntu1604-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg
index c1d860e..a326f38 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190510-225520.575
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190925-220639.261
 LABELS=ubuntu1604-docker-8c-8g
 HARDWARE_ID=v1-standard-8

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 81f53c8..8f57b1d 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 -  - 20190607-124834.118
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - helm -  - 20190925-211723.485
 LABELS=ubuntu1604-helm-2c-1g
 HARDWARE_ID=v2-highcpu-2

diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index dc38c0b..4f6cb6f 100644 (file)
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -43,6 +43,8 @@
           mvn-params: '-Dmaven.test.skip=true'
       - 'docker-version-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'appc/deployment'
     stream:
       - 'master':

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index e837a7f..104ebc4 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -79,7 +79,8 @@
     project-name: ccsdk-distribution
     build-node: ubuntu1604-builder-8c-8g
     jobs:
-      - gerrit-whitesource-scan
+      - gerrit-whitesource-scan:
+          java-opts: '-Xmx2048m'
     mvn-settings: 'ccsdk-distribution-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true

diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 4e579b6..e53c061 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -54,3 +54,24 @@
       - gerrit-info-yaml-verify
     project: dcaegen2/utils
     branch: master
+
+- project:
+    name: dcaegen2-platform-cbs-client
+    # jenkins job prefix
+    project-name: '{name}'
+    # git repo
+    project: dcaegen2/utils
+    # push credentials
+    mvn-settings: dcaegen2-utils-settings
+    # requires centos to sign release
+    build-node: centos7-builder-2c-1g
+    # subdirectory
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'onap-dcae-cbs-docker-client/{name}/.*'
+    tox-dir: onap-dcae-cbs-docker-client
+    jobs:
+      - '{project-name}-gerrit-pypi-jobs'
+    stream:
+      - master:
+          branch: master

diff --git a/jjb/dmaap/dmaap-buscontroller-csit.yaml b/jjb/dmaap/dmaap-buscontroller-csit.yaml
index 85593ba..6b46981 100644 (file)
--- a/jjb/dmaap/dmaap-buscontroller-csit.yaml
+++ b/jjb/dmaap/dmaap-buscontroller-csit.yaml
@@ -6,7 +6,7 @@
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'dmaap-buscontroller'
     stream: 'master'
-    disabled: true
+    disabled: false
     functionality:
       - 'ssl':
           trigger_jobs:

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index a985a43..fc6044f 100644 (file)
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -52,3 +52,7 @@
     # Jenkins
     jenkins-ssh-credential: 'onap-jenkins-ssh'
     jenkins-ssh-release-credential: 'jenkins-release'
+
+    # SonarCloud
+    sonarcloud_project_organization: onap
+    sonarcloud_api_token: da97604dfdc36ec82488a97ebea96ad01f7b10ff

diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
index eb40189..a2933fb 100644 (file)
--- a/jjb/oom/offline-installer.yaml
+++ b/jjb/oom/offline-installer.yaml
@@ -14,3 +14,11 @@
     jobs:
       - '{project-name}-{stream}-review':
           build_script: '{offline_review_bootstrap}'
+
+- project:
+    name: offline-installer-info
+    project-name: offline-installer
+    jobs:
+      - gerrit-info-yaml-verify
+    project: oom/offline-installer
+    branch: master

diff --git a/jjb/optf/optf-fgps.yaml b/jjb/optf/optf-fgps.yaml
index b0a373b..9443e44 100644 (file)
--- a/jjb/optf/optf-fgps.yaml
+++ b/jjb/optf/optf-fgps.yaml
@@ -20,6 +20,8 @@
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-builder-4c-4g'

diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index 2073e0a..0fcb0a5 100644 (file)
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -40,8 +40,9 @@
 - project:
     name: 'portal-coverity'
     jobs:
-      - onap-gerrit-maven-coverity
+      - 'onap-gerrit-maven-coverity'
     cron: '@daily'
+    max-git-repo-age-hours: 48
     build-node: 'ubuntu1604-builder-4c-4g'
     project: 'portal'
     project-name: 'portal'

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 7efff89..c02e03b 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -28,21 +28,21 @@
     project-name: 'sdc'
     jobs:
       - '{project-name}-{stream}-verify-java':
-          mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+          mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
       - '{project-name}-{stream}-sdc-merge-java':
           build-node: 'ubuntu1604-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
-          mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+          mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+          mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+          mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
 
@@ -84,7 +84,7 @@
     project-name: 'sdc'
     branch: 'master'
     mvn-settings: 'sdc-settings'
-    mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+    mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
 
@@ -94,7 +94,7 @@
       - gerrit-maven-clm:
           build-timeout: 120
           submodule-timeout: 30
-          mvn-params: '-P catalog -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+          mvn-params: '-P catalog -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
     nexus-iq-namespace: 'onap-'
     project: sdc
     project-name: 'sdc-catalog'
@@ -108,7 +108,7 @@
       - gerrit-maven-clm:
           build-timeout: 120
           submodule-timeout: 30
-          mvn-params: '-P onboarding -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+          mvn-params: '-P onboarding -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
     nexus-iq-namespace: 'onap-'
     project: sdc
     project-name: 'sdc-onboarding'
@@ -129,7 +129,10 @@
     project-name: 'sdc'
     build-node: ubuntu1604-docker-8c-8g
     jobs:
-      - gerrit-whitesource-scan
+      - gerrit-whitesource-scan:
+          build-timeout: 120
+          submodule-timeout: 30
+          java-opts: '-Xmx2048m'
     mvn-settings: 'sdc-settings'
     wss-product-name: 'sdc'
     mvn-clean-install: true

diff --git a/jjb/usecases/config-over-netconf.yaml b/jjb/usecases/config-over-netconf.yaml
new file mode 100644 (file)
index 0000000..d3ab0ec
--- /dev/null
+++ b/jjb/usecases/config-over-netconf.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: usecases-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'usecases'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'config-over-netconf':
+          trigger_jobs:
+            - '{project-name}-{stream}-docker-java-shell-daily'
+    robot-options: ''

diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index 9be28e0..8bcbd0b 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -42,9 +42,9 @@
           pre-build: !include-raw-escape: ./vnfsdk-ves-agent-cpp.sh
           build-dir: $WORKSPACE/veslibrary/ves_cpplibrary/src/build
           cmake-opts: '-DENABLE_COVERAGE=on -DCOVERAGE_DIR=coverage'
-          sonarcloud-api-token: 35a499f7050cdc8df24bcee4eb205f64e0d8c42a
-          sonarcloud-organization: vnfsdk-ves-agent-vescpplibrary
-          sonarcloud-project-key: org.onap.vnfsdk.ves-agent:cpplib
+          sonarcloud-api-token: '{sonarcloud_api_token}'
+          sonarcloud-organization: '{sonarcloud_project_organization}'
+          sonarcloud-project-key: '{sonarcloud_project_organization}_vnfsdk-ves-agent'
           make-opts: -j6
           stream: master
           build-node: centos7-builder-4c-4g

diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml
index dca64eb..b730ea8 100644 (file)
--- a/jjb/vvp/vvp-validation-scripts.yaml
+++ b/jjb/vvp/vvp-validation-scripts.yaml
@@ -17,6 +17,8 @@
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
 

diff --git a/shell/maven-coverity.sh b/shell/maven-coverity.sh
index 3361d40..eed10c4 100644 (file)
--- a/shell/maven-coverity.sh
+++ b/shell/maven-coverity.sh
@@ -37,7 +37,7 @@ fi
 if [ ${MAX_GIT_REPO_AGE_HOURS:=0} -ne 0 ]; then
   LAST_COMMIT_AGE=$(( $(date +%s) - $(git log -1 --pretty=format:%ct) ))
 
-  if [ $LAST_COMMIT_AGE -le $(( MAX_GIT_REPO_AGE_HOURS *60*60 )) ]; then
+  if [ $LAST_COMMIT_AGE -gt $(( MAX_GIT_REPO_AGE_HOURS *60*60 )) ]; then
     echo '[NOTICE] Git repository did not have any commits last' \
       "${MAX_GIT_REPO_AGE_HOURS} hours - no need to re-analyse it." \
       >&2