Move CLM jobs to global jjb
Use CLM job from global-jjb
Remove the local CLM job template
Issue-ID: CIMAN-65
Change-Id: I0660c6b73552d2e29851f3f120c7db2698724141
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml
index 609aab3..da6ca5b 100644
--- a/jjb/aaf/aaf-authz-docker.yaml
+++ b/jjb/aaf/aaf-authz-docker.yaml
@@ -4,7 +4,7 @@
name: aaf-authz-docker
project-name: 'aaf-authz-docker'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java-checkstyle'
- '{project-name}-{stream}-merge-properties-java':
mvn_properties:
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 4e172a6..d5db466 100644
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -3,7 +3,7 @@
name: aaf-authz
project-name: 'aaf-authz'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index 90e513b..546bd5d 100644
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -3,7 +3,7 @@
name: aaf-cadi
project-name: 'aaf-cadi'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/aaf/aaf-inno.yaml b/jjb/aaf/aaf-inno.yaml
index eb4cb88..220db3e 100644
--- a/jjb/aaf/aaf-inno.yaml
+++ b/jjb/aaf/aaf-inno.yaml
@@ -3,7 +3,7 @@
name: aaf-inno
project-name: 'aaf-inno'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 275590a..d4417c9 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -3,7 +3,7 @@
name: aai-aai-common
project-name: 'aai-aai-common'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml
index 52d87e8..fcaa803 100644
--- a/jjb/aai/aai-aai-service.yaml
+++ b/jjb/aai/aai-aai-service.yaml
@@ -3,7 +3,7 @@
name: aai-aai-service
project-name: 'aai-aai-service'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index d4760d2..c128420 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -3,7 +3,7 @@
name: aai-babel
project-name: 'aai-babel'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-java-daily'
diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index 666d793..9a00da2 100644
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -3,7 +3,7 @@
name: aai-champ
project-name: 'aai-champ'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index 0fd44b9..4109ab4 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -3,7 +3,7 @@
name: aai-data-router
project-name: 'aai-data-router'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-java-daily'
diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
index bda2cab..7e23bc3 100644
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -3,7 +3,7 @@
name: aai-esr-gui
project-name: 'aai-esr-gui'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index cd324f9..7fe252b 100644
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -3,7 +3,7 @@
name: aai-esr-server
project-name: 'aai-esr-server'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index f071cde..c0271e7 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -3,7 +3,7 @@
name: aai-logging-service
project-name: 'aai-logging-service'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 04209dc..85713cf 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -3,7 +3,7 @@
name: aai-model-loader
project-name: 'aai-model-loader'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-java-daily'
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index b2c1bd5..451e387 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -3,7 +3,7 @@
name: aai-resources
project-name: 'aai-resources'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 83a6fad..8d2163f 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -3,7 +3,7 @@
name: aai-rest-client
project-name: 'aai-rest-client'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index 8e2e011..bc855ee 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -3,7 +3,7 @@
name: aai-router-core
project-name: 'aai-router-core'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index eba07d8..6595a56 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -3,7 +3,7 @@
name: aai-search-data-service
project-name: 'aai-search-data-service'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-java-daily'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index a3ac26b..421d0f9 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -3,7 +3,7 @@
name: aai-sparky-be
project-name: 'aai-sparky-be'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-java-daily'
diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index 64ce1e8..cb32f78 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -4,7 +4,7 @@
project-name: 'aai-sparky-fe'
build-node: 'centos7-basebuild-4c-4g'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index fa198c9..3267332 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -3,7 +3,7 @@
name: aai-traversal
project-name: 'aai-traversal'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index aa7afb6..68a14e1 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -4,7 +4,7 @@
name: appc-deployment
project-name: 'appc-deployment'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 0771a12..ff31a17 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -3,7 +3,7 @@
name: appc-master
project-name: 'appc'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index e66f815..8601939 100644
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -3,7 +3,7 @@
name: ccsdk-dashboard
project-name: 'ccsdk-dashboard'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 21f7759..4199daf 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -3,7 +3,7 @@
name: ccsdk-distribution
project-name: 'ccsdk-distribution'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 8891094..2efb907 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -3,7 +3,7 @@
name: ccsdk-parent
project-name: 'ccsdk-parent'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/ccsdk/platform-nbapi.yaml b/jjb/ccsdk/platform-nbapi.yaml
index 4292eb3..1f91e3a 100644
--- a/jjb/ccsdk/platform-nbapi.yaml
+++ b/jjb/ccsdk/platform-nbapi.yaml
@@ -3,7 +3,7 @@
name: ccsdk-platform-nbapi
project-name: 'ccsdk-platform-nbapi'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
index a39b806..83a5b2e 100644
--- a/jjb/ccsdk/platform-plugins.yaml
+++ b/jjb/ccsdk/platform-plugins.yaml
@@ -3,7 +3,7 @@
name: ccsdk-platform-plugins
project-name: 'ccsdk-platform-plugins'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 4443a7d..e93bc69 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -3,7 +3,7 @@
name: ccsdk-sli-adaptors
project-name: 'ccsdk-sli-adaptors'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index dda266f..7518caf 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -3,7 +3,7 @@
name: ccsdk-sli-core
project-name: 'ccsdk-sli-core'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 2e55312..7bd0ad6 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -3,7 +3,7 @@
name: ccsdk-sli-northbound
project-name: 'ccsdk-sli-northbound'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index b588aac..dc3c7f2 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -3,7 +3,7 @@
name: ccsdk-sli-plugins
project-name: 'ccsdk-sli-plugins'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml
index 5aab634..7005eb7 100644
--- a/jjb/ccsdk/storage-pgaas.yaml
+++ b/jjb/ccsdk/storage-pgaas.yaml
@@ -3,7 +3,7 @@
name: ccsdk-storage-pgaas
project-name: 'ccsdk-storage-pgaas'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
index 5a2e550..c11b526 100644
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -3,7 +3,7 @@
name: ccsdk-utils
project-name: 'ccsdk-utils'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index 896198f..2137f46 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -4,7 +4,7 @@
name: cli
project-name: 'cli'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index 7e38855..3d43021 100644
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -4,7 +4,7 @@
name: demo
project-name: 'demo'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index e5e1e23..9dd324f 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -3,7 +3,7 @@
name: dmaap-messagerouter-dmaapclient
project-name: 'dmaap-messagerouter-dmaapclient'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
index 9b8a028..90f4689 100644
--- a/jjb/dmaap/dmaap-messagerouter-docker.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml
@@ -4,7 +4,7 @@
name: dmaap-messagerouter-docker
project-name: 'dmaap-messagerouter-docker'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index a959f85..591f332 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -3,7 +3,7 @@
name: dmaap-messagerouter-messageservice
project-name: 'dmaap-messagerouter-messageservice'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index 9b151ed..44742be 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -3,7 +3,7 @@
name: dmaap-messagerouter-mirroragent
project-name: 'dmaap-messagerouter-mirroragent'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 8db7b7c..1d360a7 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -3,7 +3,7 @@
name: dmaap-messagerouter-msgrtr
project-name: 'dmaap-messagerouter-msgrtr'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index f73f273..d92e621 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -20,6 +20,7 @@
# Java
jdk: ''
+ java-version: openjdk8
# Maven
onap-infra-mvn-opts: |
@@ -43,4 +44,4 @@
submodule-recursive: true
# Jenkins
- jenkins-ssh-credential: onap-jenkins-ssh
\ No newline at end of file
+ jenkins-ssh-credential: onap-jenkins-ssh
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 5255cef..95e2ecc 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1,65 +1,5 @@
---
- job-template:
- # Template used for running CLM scans
- # Arguements:
- # {name} - Project Shortname
- # {project} - Fully qualified project name
- # {mvn-settings} - Project maven settings file
- # {jdk}
- name: '{project-name}-{stream}-clm'
-
- project-type: freestyle
- node: '{build-node}'
- jdk: '{jdk}'
-
- properties:
- - infra-properties:
- build-days-to-keep: 30
-
- parameters:
- - infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
-
- scm:
- - git-scm:
- refspec: ''
- branch: '{branch}'
-
- wrappers:
- - infra-wrappers:
- build-timeout: '{build-timeout}'
-
- triggers:
- - timed: 'H H * * 6'
-
- builders:
- - provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
- - maven-target:
- maven-version: 'mvn33'
- pom: 'pom.xml'
- goals: |
- clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index
- {onap-infra-mvn-opts}
- java-opts:
- - '-Xmx4096m -XX:MaxPermSize=512m'
- settings: '{mvn-settings}'
- settings-type: cfp
- global-settings: 'global-settings'
- global-settings-type: cfp
- - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
- - sonatype-clm:
- application-name: '{project-name}'
-
- publishers:
- - infra-shiplogs:
- maven-version: '{maven-version}'
-
-- job-template:
# Job template for Java verify jobs
#
# The purpose of this job template is to run "maven clean install" for
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index 7a6f273..25f93af 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -3,7 +3,7 @@
name: holmes-common
project-name: 'holmes-common'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml
index 829ee79..34362cc 100644
--- a/jjb/holmes/holmes-dsa.yaml
+++ b/jjb/holmes/holmes-dsa.yaml
@@ -3,7 +3,7 @@
name: holmes-dsa
project-name: 'holmes-dsa'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index ce378eb..31aac3f 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -3,7 +3,7 @@
name: holmes-engine-management
project-name: 'holmes-engine-management'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 069c047..ab143e6 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -3,7 +3,7 @@
name: holmes-rule-management
project-name: 'holmes-rule-management'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
index 799f852..4fb3df3 100644
--- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
+++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
@@ -15,8 +15,8 @@
pattern: 'nfvparser/**'
pom: 'nfvparser/pom.xml'
jobs:
- - '{project-name}-{stream}-clm'
- '{project-name}-{stream}-{subproject}-verify-python'
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar'
diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index 69042cb..e0e602e 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -3,7 +3,7 @@
name: msb-apigateway
project-name: 'msb-apigateway'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index bb20c4b..7156dce 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -3,7 +3,7 @@
name: msb-discovery
project-name: 'msb-discovery'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml
index 5339bd1..dcb1a2c 100644
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -3,7 +3,7 @@
name: msb-java-sdk
project-name: 'msb-java-sdk'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
index 3e88bf0..fd9539a 100644
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -3,7 +3,7 @@
name: msb-swagger-sdk
project-name: 'msb-swagger-sdk'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml
index a0e9bc0..befce13 100644
--- a/jjb/oom/oom-registrator.yaml
+++ b/jjb/oom/oom-registrator.yaml
@@ -3,7 +3,7 @@
name: oom-registrator
project-name: 'oom-registrator'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index a16f0aa..0720d89 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -3,7 +3,7 @@
name: policy-api
project-name: 'policy-api'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 53d6726..2d13f98 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -3,7 +3,7 @@
name: policy-common
project-name: 'policy-common'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 4378127..c322d70 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -3,7 +3,7 @@
name: policy-drools-applications
project-name: 'policy-drools-applications'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 5a740bd..1371895 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -3,7 +3,7 @@
name: policy-drools-pdp
project-name: 'policy-drools-pdp'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 8ee95e6..01219cb 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -3,7 +3,7 @@
name: policy-engine
project-name: 'policy-engine'
jobs:
- - '{project-name}-{stream}-clm':
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index db96845..7b96f0a 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -3,7 +3,7 @@
name: policy-gui
project-name: 'policy-gui'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index f0d15ba..da763bd 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -3,7 +3,7 @@
name: policy-pap
project-name: 'policy-pap'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml
index 36e2616..1dec30a 100644
--- a/jjb/policy/policy-pdp.yaml
+++ b/jjb/policy/policy-pdp.yaml
@@ -3,7 +3,7 @@
name: policy-pdp
project-name: 'policy-pdp'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index 38fbcd4..5d45b24 100644
--- a/jjb/sdc/sdc-jtosca.yaml
+++ b/jjb/sdc/sdc-jtosca.yaml
@@ -4,7 +4,7 @@
name: sdc-jtosca
project-name: 'sdc-jtosca'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 086d66d..a76db75 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -4,7 +4,7 @@
name: sdc-sdc-distribution-client
project-name: 'sdc-sdc-distribution-client'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml
index 36978ed..cbe41fd 100644
--- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml
+++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml
@@ -4,7 +4,7 @@
name: sdc-sdc-titan-cassandra
project-name: 'sdc-sdc-titan-cassandra'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 230fdbb..4c43e27 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -4,7 +4,7 @@
name: sdc-sdc-tosca
project-name: 'sdc-sdc-tosca'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 9fb346b..589f41b 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -3,7 +3,7 @@
name: sdc-sdc-workflow-designer
project-name: 'sdc-sdc-workflow-designer'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/sdnc/sdnc-adaptors.yaml b/jjb/sdnc/sdnc-adaptors.yaml
index 7cf1c1e..a857757 100644
--- a/jjb/sdnc/sdnc-adaptors.yaml
+++ b/jjb/sdnc/sdnc-adaptors.yaml
@@ -3,7 +3,7 @@
name: sdnc-adaptors
project-name: 'sdnc-adaptors'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java-skip-tests'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/sdnc/sdnc-core.yaml b/jjb/sdnc/sdnc-core.yaml
index 6227877..9648bd1 100644
--- a/jjb/sdnc/sdnc-core.yaml
+++ b/jjb/sdnc/sdnc-core.yaml
@@ -7,7 +7,7 @@
pom: 'rootpom/pom.xml'
pattern: 'rootpom/**'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-java-daily-no-sonar'
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index b6175ce..1bef502 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -3,7 +3,7 @@
name: sdnc-northbound
project-name: 'sdnc-northbound'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 0ee8893..b2705ab 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -4,7 +4,7 @@
name: sdnc-oam
project-name: 'sdnc-oam'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml
index 5118cc1..9d32e23 100644
--- a/jjb/sdnc/sdnc-plugins.yaml
+++ b/jjb/sdnc/sdnc-plugins.yaml
@@ -3,7 +3,7 @@
name: sdnc-plugins
project-name: 'sdnc-plugins'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java-skip-tests'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 3a65a63..957492b 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -3,7 +3,7 @@
name: so-libs
project-name: 'so-libs'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml
index c566178..46d2570 100644
--- a/jjb/ui/ui-dmaapbc.yaml
+++ b/jjb/ui/ui-dmaapbc.yaml
@@ -4,7 +4,7 @@
project-name: 'ui-dmaapbc'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/vid/vid-asdcclient.yaml b/jjb/vid/vid-asdcclient.yaml
index 406f211..46c2708 100644
--- a/jjb/vid/vid-asdcclient.yaml
+++ b/jjb/vid/vid-asdcclient.yaml
@@ -3,7 +3,7 @@
name: vid-asdcclient
project-name: 'vid-asdcclient'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 33a7f28..5382f9f 100644
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -3,7 +3,7 @@
name: vid
project-name: 'vid'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 890ff86..86dda37 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -3,7 +3,7 @@
name: vnfsdk-refrepo
project-name: 'vnfsdk-refrepo'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index b3e2cbd..ef20415 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -3,7 +3,7 @@
name: vnfsdk-validation
project-name: 'vnfsdk-validation'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'