Merge "Migrate VVP to SonarCloud"
diff --git a/global-jjb b/global-jjb
index a2cfbc6..1fb55e8 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit a2cfbc66e675655ed0fb7d76862fdc044d96678d
+Subproject commit 1fb55e807d49e36b27d94d0c411c6907d2216068
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
--- 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/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh
index 7b124aa..d450c7b 100644
--- a/jenkins-config/global-vars-production.sh
+++ b/jenkins-config/global-vars-production.sh
@@ -19,3 +19,4 @@
SIGUL_KEY=onap-release-2018
SILO=production
SONAR_URL=https://sonar.onap.org
+MASTER_RTD_PROJECT=doc
diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh
index 146fe6e..412f808 100644
--- a/jenkins-config/global-vars-sandbox.sh
+++ b/jenkins-config/global-vars-sandbox.sh
@@ -19,3 +19,4 @@
SIGUL_KEY=onap-test
SILO=sandbox
SONAR_URL=https://sonar.onap.org
+MASTER_RTD_PROJECT=doc-test
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 174f529..8a97a17 100644
--- 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
@@ -29,8 +30,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'ccsdk-apps-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 7e6645d..91fb432 100644
--- 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
@@ -26,8 +26,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'ccsdk-cds-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index 8b01af9..497249a 100644
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -16,8 +16,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'ccsdk-dashboard-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 8e9c9ac..eab7aa8 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -18,17 +18,13 @@
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'
stream:
- 'master':
branch: 'master'
- - 'elalto-fluorine':
- branch: 'elalto-fluorine'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'ccsdk-distribution-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 37f13ef..fc8b655 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -17,10 +17,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
- - 'elalto-fluorine':
- branch: 'elalto-fluorine'
mvn-settings: 'ccsdk-features-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index a6ff815..4a73968 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -19,10 +19,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto-fluorine':
- branch: 'elalto-fluorine'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'ccsdk-parent-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
index 9ee1504..6a943f0 100644
--- a/jjb/ccsdk/platform-plugins.yaml
+++ b/jjb/ccsdk/platform-plugins.yaml
@@ -17,8 +17,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'ccsdk-platform-plugins-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 7e83f00..1a0e106 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -17,10 +17,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto-fluorine':
- branch: 'elalto-fluorine'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'ccsdk-sli-adaptors-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 73d5b0b..088a9e0 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -17,10 +17,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto-fluorine':
- branch: 'elalto-fluorine'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'ccsdk-sli-core-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index cbd12c4..7e296da 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -17,10 +17,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto-fluorine':
- branch: 'elalto-fluorine'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'ccsdk-sli-northbound-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index 0997bff..c955edd 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -17,10 +17,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto-fluorine':
- branch: 'elalto-fluorine'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'ccsdk-sli-plugins-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 89eb6b6..ce11679 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -6,8 +6,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
# apply to all jobs
project: 'dcaegen2/collectors/datafile'
mvn-settings: 'dcaegen2-collectors-datafile-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index ab4e9f5..d101fba 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -7,8 +7,6 @@
- 'master':
branch: 'master'
java-version: openjdk11
- - 'elalto':
- branch: 'elalto'
# apply to all jobs
project: 'dcaegen2/collectors/hv-ves'
mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index b707826..c07a546 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -12,8 +12,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'dcaegen2-deployments-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
index c00ded6..450bd4f 100644
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
@@ -6,13 +6,12 @@
- '{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/platform/blueprints'
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'dcaegen2-platform-blueprints-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 670b71d..9b8b581 100644
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -26,8 +26,6 @@
stream:
- master:
branch: master
- - elalto:
- branch: elalto
- project:
name: dcaegen2-platform-configbinding-sonar
diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
index 68d4f96..c03f0d2 100644
--- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
@@ -12,8 +12,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index f1a67cd..74d663d 100644
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -21,8 +21,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'dcaegen2-platform-inventory-api-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
index 5d57fd1..2fd1eae 100644
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -11,8 +11,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'dcaegen2-platform-plugins-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
index 81c9b13..db819a1 100644
--- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
@@ -21,8 +21,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
# due to a strange macro / variable translation problem this needs
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 81c70d1..886949f 100644
--- 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/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index b8ff328..057b05b 100644
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -26,7 +26,7 @@
jobs:
- gerrit-maven-sonar
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1604-docker-8c-8g
project: 'dcaegen2/services/heartbeat'
project-name: 'dcaegen2-services-heartbeat'
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index e82cf47..6d5e27f 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -21,8 +21,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'dcaegen2-services-mapper-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index 0bde5de..fcb97ef 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,8 +6,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
# apply to all jobs
project: 'dcaegen2/services/pm-mapper'
mvn-settings: 'dcaegen2-services-pm-mapper-settings'
diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index 4073a9f..5913c0f 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -21,8 +21,6 @@
- 'master':
branch: 'master'
java-version: openjdk11
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'dcaegen2-services-prh-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 5cbb321..b9c8823 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -17,8 +17,6 @@
- 'master':
branch: 'master'
java-version: openjdk11
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'dcaegen2-services-sdk-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index 99055a7..2cff2a1 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -21,8 +21,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'dcaegen2-services-son-handler-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index dd0b0cc..1305937 100644
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -17,8 +17,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'dcaegen2-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 8fbd19f..18cb107 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -26,6 +26,11 @@
name: dmaap-datarouter-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: 'dmaap/datarouter'
diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
index f9785b9..5793822 100644
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ b/jjb/dmaap/dmaap-dbcapi.yaml
@@ -30,6 +30,11 @@
name: dmaap-dbcapi-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: 'dmaap/dbcapi'
diff --git a/jjb/dmaap/dmaap-kafka.yaml b/jjb/dmaap/dmaap-kafka.yaml
index bc42004..f3b4fb8 100644
--- a/jjb/dmaap/dmaap-kafka.yaml
+++ b/jjb/dmaap/dmaap-kafka.yaml
@@ -15,6 +15,11 @@
name: dmaap-kafka-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: 'dmaap/kafka11aaf'
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 9c932b4..d92e85a 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -23,6 +23,11 @@
name: dmaap-messagerouter-dmaapclient-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: 'dmaap/messagerouter/dmaapclient'
diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
index d044ba1..21a8ba5 100644
--- 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/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index aef8067..ba23d9a 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -22,6 +22,11 @@
name: dmaap-messagerouter-messageservice-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: 'dmaap/messagerouter/messageservice'
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index 09633d9..2d32ea0 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -24,6 +24,11 @@
name: dmaap-messagerouter-mirroragent-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: 'dmaap/messagerouter/mirroragent'
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 9127fca..90baffd 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -24,6 +24,11 @@
name: dmaap-messagerouter-msgrtr-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: 'dmaap/messagerouter/msgrtr'
diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml
index 234a767..be97b29 100644
--- a/jjb/doc/doc-templates-rtd.yaml
+++ b/jjb/doc/doc-templates-rtd.yaml
@@ -71,7 +71,7 @@
- shell: !include-raw: doc-install-plantuml.sh
- shell: |
#!/bin/bash
- virtualenv $WORKSPACE/venv-tox
+ python3 -m venv $WORKSPACE/venv-tox
source $WORKSPACE/venv-tox/bin/activate
pip install --upgrade pip
pip install --upgrade tox argparse
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index d950825..3f8816e 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -31,6 +31,11 @@
name: holmes-common-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: 'holmes/common'
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index 0788584..cb23377 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -29,6 +29,11 @@
name: holmes-engine-management-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: 'holmes/engine-management'
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 5f1bae2..7e4342b 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -29,6 +29,11 @@
name: holmes-rule-management-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: 'holmes/rule-management'
diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 10b713e..b7b92fd 100644
--- 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/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
index 8c19c2a..4ef1801 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
@@ -51,6 +51,11 @@
name: logging-analytics-pomba-pomba-aai-context-builder-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: logging-analytics/pomba/pomba-aai-context-builder
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
index ac73c5c..be776ff 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
@@ -24,6 +24,11 @@
name: logging-analytics-pomba-pomba-audit-common-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: logging-analytics/pomba/pomba-audit-common
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
index 6735358..3f4f3cb 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
@@ -31,6 +31,11 @@
name: logging-analytics-pomba-pomba-context-aggregator-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: logging-analytics/pomba/pomba-context-aggregator
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
index 56bd157..82317ba 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
@@ -51,6 +51,11 @@
name: logging-analytics-pomba-pomba-network-discovery-context-builder-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: logging-analytics/pomba/pomba-network-discovery-context-builder
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
index ddc3ac9..ba9cf5d 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
@@ -49,6 +49,11 @@
name: logging-analytics-pomba-pomba-sdc-context-builder-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: logging-analytics/pomba/pomba-sdc-context-builder
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
index e3fce2a..a40fda1 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
@@ -47,6 +47,11 @@
name: logging-analytics-pomba-pomba-sdnc-context-builder-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: 'H 11 * * *'
build-node: ubuntu1604-builder-4c-4g
project: logging-analytics/pomba/pomba-sdnc-context-builder
diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 9ff1348..5d936a8 100644
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -56,6 +56,11 @@
name: logging-analytics-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: 'logging-analytics'
diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml
index 0d8e74d..a58af1c 100644
--- a/jjb/modeling/modeling-etsicatalog.yaml
+++ b/jjb/modeling/modeling-etsicatalog.yaml
@@ -34,6 +34,11 @@
name: modeling-etsicatalog-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: centos7-redis-4c-4g
project: 'modeling/etsicatalog'
diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
index 4ff6b3d..8e6a8e6 100644
--- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
+++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
@@ -28,6 +28,11 @@
name: modeling-toscaparsers-nfvparser-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: 'modeling/toscaparsers'
diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index b099e82..b4ba623 100644
--- 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/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index ec149ad..830ac93 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -3,6 +3,7 @@
name: optf-osdf
project-name: 'optf-osdf'
project: 'optf/osdf'
+ python-version: python3
stream:
- 'master':
branch: 'master'
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
new file mode 100644
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/rtdv3/rtdv3.yaml b/jjb/rtdv3/rtdv3.yaml
new file mode 100644
index 0000000..c87a652
--- /dev/null
+++ b/jjb/rtdv3/rtdv3.yaml
@@ -0,0 +1,27 @@
+# Global read the docs version 3 jobs
+#
+# jobs trigger for all projects, all branches
+# on any changes to files in a docs/ directory
+# and publish subprojects to readthedocs.io
+# using credentials from Jenkins settings
+---
+- project:
+ name: rtdv3-view
+ project-name: rtdv3-global
+ views:
+ - project-view
+
+- project:
+ name: rtdv3-global
+ build-node: centos7-builder-2c-1g
+ # override the default to ignore ref-updated-event (tag)
+ gerrit_merge_triggers:
+ - change-merged-event
+ - comment-added-contains-event:
+ comment-contains-value: remerge$
+ jobs:
+ - rtdv3-global-verify
+ - rtdv3-global-merge
+ stream:
+ - master:
+ branch: '*'
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 1d3b37e..8a8c6b4 100644
--- 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
--- 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
--- 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/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index 9d49b44..b93bf60 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -40,6 +40,11 @@
name: vfc-gvnfm-vnflcm-lcm-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'
mvn-params: '-f lcm/pom.xml'
build-node: centos7-redis-4c-4g
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index d688bcc..4412d09 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -34,6 +34,11 @@
name: vfc-gvnfm-vnfmgr-mgr-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'
mvn-params: '-f mgr/pom.xml'
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index e27e3c6..8fbf442 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -35,6 +35,11 @@
name: vfc-gvnfm-vnfres-res-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'
mvn-params: '-f res/pom.xml'
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index 6e2e934..e12807d 100644
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -36,6 +36,11 @@
name: vfc-nfvo-catalog-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: centos7-redis-4c-4g
project: 'vfc/nfvo/catalog'
diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index 7bf8cfb..348cef1 100644
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -33,6 +33,11 @@
name: vfc-nfvo-driver-ems-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: 'vfc/nfvo/driver/ems'
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index 1696ea5..273e377 100644
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -34,6 +34,11 @@
name: vfc-nfvo-driver-sfc-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'
mvn-params: '-f zte/sfc-driver/pom.xml'
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 80680bd..709562c 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -28,6 +28,11 @@
name: vfc-nfvo-driver-svnfm-huawei-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
mvn-params: '-f huawei/pom.xml'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index a818758..95a4dee 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -37,6 +37,11 @@
name: vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter-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'
mvn-params: '-f gvnfmadapter/pom.xml'
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
index 2fea7c7..0990efb 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
@@ -23,6 +23,11 @@
name: vfc-nfvo-driver-vnfm-gvnfm-juju-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
mvn-params: '-f juju/juju-vnfmadapter/pom.xml'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
index 3ba98f6..96c9988 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
@@ -76,6 +76,11 @@
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
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"
build-node: ubuntu1604-builder-4c-4g
- project:
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
index 0b121e1..13f5945 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -30,6 +30,11 @@
name: vfc-nfvo-driver-vnfm-svnfm-zte-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'
mvn-params: '-f zte/vmanager/pom.xml'
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index 30e6678..ff6c94b 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -30,6 +30,11 @@
name: vfc-nfvo-lcm-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: centos7-redis-4c-4g
project: 'vfc/nfvo/lcm'
diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
index dec3110..f89e2fc 100644
--- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml
+++ b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
@@ -26,6 +26,11 @@
name: vfc-nfvo-multivimproxy-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: 'vfc/nfvo/multivimproxy'
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 2370d35..9fa63c6 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -26,6 +26,11 @@
name: vfc-nfvo-resmanagement-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: 'vfc/nfvo/resmanagement'
diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index ae679b5..0b3cf05 100644
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -83,6 +83,11 @@
name: vfc-nfvo-wfengine-wfenginemgrservice-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"
mvn-params: '-f wfenginemgrservice/pom.xml'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
@@ -96,6 +101,11 @@
name: vfc-nfvo-wfengine-activiti-extension-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"
mvn-params: '-f activiti-extension/pom.xml'
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml
index e3b8086..daed681 100644
--- 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}}'