summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/aaf/aaf-authz-docker.yaml2
-rw-r--r--jjb/aaf/aaf-authz.yaml2
-rw-r--r--jjb/aaf/aaf-cadi.yaml2
-rw-r--r--jjb/aaf/aaf-inno.yaml2
-rw-r--r--jjb/aai/aai-aai-common.yaml2
-rw-r--r--jjb/aai/aai-aai-service.yaml2
-rw-r--r--jjb/aai/aai-babel.yaml2
-rw-r--r--jjb/aai/aai-champ.yaml2
-rw-r--r--jjb/aai/aai-data-router.yaml2
-rw-r--r--jjb/aai/aai-esr-gui.yaml2
-rw-r--r--jjb/aai/aai-esr-server.yaml2
-rw-r--r--jjb/aai/aai-logging-service.yaml2
-rw-r--r--jjb/aai/aai-model-loader.yaml2
-rw-r--r--jjb/aai/aai-resources.yaml2
-rw-r--r--jjb/aai/aai-rest-client.yaml2
-rw-r--r--jjb/aai/aai-router-core-service.yaml2
-rw-r--r--jjb/aai/aai-search-data-service.yaml2
-rw-r--r--jjb/aai/aai-sparky-be.yaml2
-rw-r--r--jjb/aai/aai-sparky-fe.yaml2
-rw-r--r--jjb/aai/aai-traversal.yaml2
-rw-r--r--jjb/appc/appc-deployment.yaml2
-rw-r--r--jjb/appc/appc-master.yaml2
-rw-r--r--jjb/ccsdk/dashboard.yaml2
-rw-r--r--jjb/ccsdk/distribution.yaml2
-rw-r--r--jjb/ccsdk/parent.yaml2
-rw-r--r--jjb/ccsdk/platform-nbapi.yaml2
-rw-r--r--jjb/ccsdk/platform-plugins.yaml2
-rw-r--r--jjb/ccsdk/sli-adaptors.yaml2
-rw-r--r--jjb/ccsdk/sli-core.yaml2
-rw-r--r--jjb/ccsdk/sli-northbound.yaml2
-rw-r--r--jjb/ccsdk/sli-plugins.yaml2
-rw-r--r--jjb/ccsdk/storage-pgaas.yaml2
-rw-r--r--jjb/ccsdk/utils.yaml2
-rw-r--r--jjb/cli/cli.yaml2
-rw-r--r--jjb/dcaegen2/apod-analytics.yaml12
-rw-r--r--jjb/demo/demo.yaml2
-rw-r--r--jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml2
-rw-r--r--jjb/dmaap/dmaap-messagerouter-docker.yaml2
-rw-r--r--jjb/dmaap/dmaap-messagerouter-messageservice.yaml2
-rw-r--r--jjb/dmaap/dmaap-messagerouter-mirroragent.yaml2
-rw-r--r--jjb/dmaap/dmaap-messagerouter-msgrtr.yaml2
-rw-r--r--jjb/global-defaults.yaml3
-rw-r--r--jjb/global-templates-java.yaml60
-rw-r--r--jjb/holmes/holmes-common.yaml2
-rw-r--r--jjb/holmes/holmes-dsa.yaml2
-rw-r--r--jjb/holmes/holmes-engine-mgt.yaml2
-rw-r--r--jjb/holmes/holmes-rule-mgt.yaml2
-rw-r--r--jjb/integration/integration.yaml10
-rw-r--r--jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml2
-rw-r--r--jjb/modeling/modeling-toscaparsers-nfvparser.yaml2
-rw-r--r--jjb/msb/msb-apigateway.yaml2
-rw-r--r--jjb/msb/msb-discovery.yaml2
-rw-r--r--jjb/msb/msb-java-sdk.yaml2
-rw-r--r--jjb/msb/msb-swagger-sdk.yaml2
-rw-r--r--jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh3
-rw-r--r--jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh10
-rw-r--r--jjb/multicloud/multicloud-framework-java.yaml1
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-java.yaml5
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml25
-rw-r--r--jjb/oom/oom-registrator.yaml2
-rw-r--r--jjb/policy/policy-api.yaml2
-rw-r--r--jjb/policy/policy-common.yaml2
-rw-r--r--jjb/policy/policy-drools-applications.yaml2
-rw-r--r--jjb/policy/policy-drools-pdp.yaml2
-rw-r--r--jjb/policy/policy-engine.yaml2
-rw-r--r--jjb/policy/policy-gui.yaml2
-rw-r--r--jjb/policy/policy-pap.yaml2
-rw-r--r--jjb/policy/policy-pdp.yaml2
-rw-r--r--jjb/sdc/sdc-jtosca.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-distribution-client.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-titan-cassandra.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-tosca.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-workflow-designer.yaml2
-rw-r--r--jjb/sdnc/sdnc-adaptors.yaml2
-rw-r--r--jjb/sdnc/sdnc-core.yaml2
-rw-r--r--jjb/sdnc/sdnc-northbound.yaml2
-rw-r--r--jjb/sdnc/sdnc-oam.yaml2
-rw-r--r--jjb/sdnc/sdnc-plugins.yaml2
-rw-r--r--jjb/so/so-libs.yaml2
-rw-r--r--jjb/ui/ui-dmaapbc.yaml2
-rw-r--r--jjb/usecaseui/usecase-ui-server.yaml2
-rw-r--r--jjb/usecaseui/usecase-ui.yaml1
-rw-r--r--jjb/vfc/vfc-nfvo-driver-sfc.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml6
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-resmanagement.yaml5
-rw-r--r--jjb/vid/vid-asdcclient.yaml2
-rw-r--r--jjb/vid/vid.yaml2
-rw-r--r--jjb/vnfsdk/vnfsdk-refrepo.yaml2
-rw-r--r--jjb/vnfsdk/vnfsdk-validation.yaml2
90 files changed, 136 insertions, 161 deletions
diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml
index 609aab3ba..da6ca5b55 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 4e172a6e5..d5db466d3 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 90e513bb8..546bd5da6 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 eb4cb8896..220db3e61 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 275590afc..d4417c9da 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 52d87e8ba..fcaa803d8 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 d4760d222..c128420e0 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 666d79395..9a00da2e2 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 0fd44b9cb..4109ab413 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 bda2cabfc..7e23bc371 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 cd324f93d..7fe252bd1 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 f071cde9c..c0271e74d 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 04209dcbc..85713cf6f 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 b2c1bd51a..451e38733 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 83a6fadab..8d2163f39 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 8e2e01110..bc855ee72 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 eba07d899..6595a561f 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 a3ac26b35..421d0f9a4 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 64ce1e895..cb32f7866 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 fa198c90f..32673328b 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 aa7afb67b..68a14e1a4 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 0771a1246..ff31a1746 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 e66f815ec..8601939e1 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 21f7759b8..4199daf82 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 8891094b9..2efb907aa 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 4292eb3e0..1f91e3acb 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 a39b80697..83a5b2e5b 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 4443a7d62..e93bc69a9 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 dda266f7d..7518caf67 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 2e5531205..7bd0ad657 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 b588aacdb..dc3c7f288 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 5aab63426..7005eb7a3 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 5a2e550b4..c11b5266e 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 896198f5e..2137f463d 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/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml
index 33f216bae..b7609bdea 100644
--- a/jjb/dcaegen2/apod-analytics.yaml
+++ b/jjb/dcaegen2/apod-analytics.yaml
@@ -12,19 +12,13 @@
project: 'dcaegen2/analytics/tca'
mvn-settings: 'dcaegen2-analytics-tca-settings'
files: '**'
+ maven-deploy-properties: |
+ deployAtEnd=true
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
jobs:
- - '{project-name}-{stream}-release-java-daily':
- mvn-goals-versioning:
- 'versions:set versions:update-child-modules versions:commit'
- mvn-goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}}'
- maven-deploy-properties: |
- deployAtEnd=true
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-verify-java-skip-tests':
mvn-goals: 'clean install'
- '{project-name}-{stream}-merge-java':
diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index 7e388552c..3d43021dc 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 e5e1e231d..9dd324fe0 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 9b8a0289a..90f4689df 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 a959f8515..591f33282 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 9b151ed23..44742be9e 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 8db7b7c09..1d360a733 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 f73f27328..de267e229 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -20,6 +20,7 @@
# Java
jdk: ''
+ java-version: ''
# 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 a322f5350..be02418eb 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 7a6f273fe..25f93aff6 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 829ee798f..34362cc58 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 ce378eb1c..31aac3f49 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 069c04779..ab143e62a 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/integration/integration.yaml b/jjb/integration/integration.yaml
index 1243121eb..adfd8853e 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -3,10 +3,14 @@
name: integration
project-name: 'integration'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{stream}-{subproject}-release-version-java-daily'
project: 'integration'
+ subproject:
+ - 'version-manifest':
+ pom: 'version-manifest/pom.xml'
+ pattern: 'version-manifest/**'
stream:
- 'master':
branch: 'master'
diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
index 892a99cb4..699e66bad 100644
--- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
+++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
@@ -8,7 +8,7 @@
- 'master':
branch: 'master'
mvn-settings: 'modeling-toscaparsers-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-docker-8c-8g
subproject:
- 'javatoscachecker':
pattern: 'javatoscachecker/**'
diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
index 799f85237..4fb3df3c4 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 69042cb5f..e0e602e60 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 bb20c4b03..7156dceee 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 5339bd113..dcb1a2c9c 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 3e88bf058..fd9539a21 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/multicloud/build-multicloud-openstack-vmware-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh
index 0a8f304ad..6cfe920ed 100644
--- a/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh
+++ b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh
@@ -9,6 +9,3 @@ chmod 755 ./vio/docker/*.*
./vio/docker/build_image.sh
-echo '========================== Building docker for vesagent =========================='
-chmod 755 ./vesagent/docker/*.*
-./vesagent/docker/docker-build.sh
diff --git a/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh
new file mode 100644
index 000000000..bdb5a849c
--- /dev/null
+++ b/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+echo '========================== Building docker for vesagent =========================='
+chmod 755 ./vesagent/docker/*.*
+./vesagent/docker/docker-build.sh
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 6535e8420..9f140ced5 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -14,6 +14,7 @@
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'install'
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index e2c4ec889..6b6e9a648 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -11,13 +11,10 @@
- 'vio':
pom: 'vio/pom.xml'
pattern: 'vio/**'
- - 'vesagent':
- pom: 'vesagent/pom.xml'
- pattern: 'vesagent/**'
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'install'
diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
new file mode 100644
index 000000000..5e141a905
--- /dev/null
+++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
@@ -0,0 +1,25 @@
+---
+- project:
+ name: multicloud-openstack-vmware-vesagent-java
+ project-name: 'multicloud-openstack-vmware-vesagent'
+ project: 'multicloud/openstack/vmware'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'multicloud-openstack-vmware-settings'
+ subproject:
+ - 'vesagent':
+ pom: 'vesagent/pom.xml'
+ pattern: 'vesagent/**'
+ jobs:
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-docker-java-version-shell-daily':
+ docker-pom: 'pom.xml'
+ mvn-goals: 'install'
+ script:
+ !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml
index a0e9bc0fc..befce135d 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 a16f0aaa2..0720d89c0 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 53d6726e2..2d13f9881 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 437812763..c322d70b1 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 5a740bd86..137189526 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 8ee95e674..01219cb54 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 db9684541..7b96f0a58 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 f0d15bac5..da763bd53 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 36e2616b2..1dec30aa5 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 38fbcd401..5d45b24c5 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 086d66dab..a76db75aa 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 36978edce..cbe41fdf8 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 230fdbb19..4c43e27e6 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 9fb346bd2..589f41bae 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 7cf1c1e61..a85775785 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 622787714..9648bd181 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 b6175ce80..1bef5027a 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 0ee8893e9..b2705abf6 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 5118cc179..9d32e23e5 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 3a65a6371..957492b93 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 c56617849..46d2570a0 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/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index 6f16c12c1..727c60391 100644
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -11,7 +11,7 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-docker-java-daily'
files: '**'
archive-artifacts: ''
diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index cd8368c7e..69c7f831c 100644
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -11,6 +11,7 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
- '{project-name}-{stream}-docker-java-daily'
files: '**'
archive-artifacts: ''
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index 9fef201ac..1a05a1009 100644
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -14,7 +14,7 @@
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{stream}-{subproject}-release-java-daily'
+ - '{project-name}-{stream}-{subproject}-release-version3-java-daily'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index db40e10c8..a7406c6ab 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -9,12 +9,12 @@
mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
subproject:
- 'drv-vnfm-huawei':
- pom: 'huawei/vnfmadapter/pom.xml'
- pattern: 'huawei/vnfmadapter/**'
+ pom: 'huawei/pom.xml'
+ pattern: 'huawei/**'
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{stream}-{subproject}-release-java-daily'
+ - '{project-name}-{stream}-{subproject}-release-version3-java-daily'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
index 62a06ae31..0613b38ce 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
@@ -14,7 +14,7 @@
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{stream}-{subproject}-release-java-daily'
+ - '{project-name}-{stream}-{subproject}-release-version3-java-daily'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 2dc778d16..0d2437328 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -9,10 +9,15 @@
- 'master':
branch: 'master'
build-node: ubuntu1604-basebuild-4c-4g
+ subproject:
+ - 'deployment':
+ pom: 'ResmanagementService/deployment/pom.xml'
+ pattern: 'ResmanagementService/deployment/**'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-{subproject}-release-version3-java-daily'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'install'
diff --git a/jjb/vid/vid-asdcclient.yaml b/jjb/vid/vid-asdcclient.yaml
index 406f211fb..46c27089b 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 33a7f2851..5382f9f1c 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 890ff8604..86dda376b 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 b3e2cbdbc..ef20415a3 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'