summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/aaf/aaf-authz-docker.yaml4
-rw-r--r--jjb/aaf/aaf-authz.yaml3
-rw-r--r--jjb/aaf/aaf-cadi.yaml3
-rw-r--r--jjb/aaf/aaf-inno.yaml3
-rw-r--r--jjb/aai/aai-aai-common.yaml3
-rw-r--r--jjb/aai/aai-aai-service.yaml3
-rw-r--r--jjb/aai/aai-babel.yaml3
-rw-r--r--jjb/aai/aai-champ.yaml3
-rw-r--r--jjb/aai/aai-data-router.yaml3
-rw-r--r--jjb/aai/aai-esr-gui.yaml3
-rw-r--r--jjb/aai/aai-esr-server.yaml3
-rw-r--r--jjb/aai/aai-logging-service.yaml3
-rw-r--r--jjb/aai/aai-model-loader.yaml5
-rw-r--r--jjb/aai/aai-resources.yaml3
-rw-r--r--jjb/aai/aai-rest-client.yaml3
-rw-r--r--jjb/aai/aai-router-core-service.yaml3
-rw-r--r--jjb/aai/aai-search-data-service.yaml3
-rw-r--r--jjb/aai/aai-sparky-be.yaml3
-rw-r--r--jjb/aai/aai-sparky-fe.yaml3
-rw-r--r--jjb/aai/aai-traversal.yaml3
-rw-r--r--jjb/appc/appc-deployment.yaml3
-rw-r--r--jjb/appc/appc-master.yaml4
-rw-r--r--jjb/ccsdk/dashboard.yaml3
-rw-r--r--jjb/ccsdk/distribution.yaml3
-rw-r--r--jjb/ccsdk/parent.yaml3
-rw-r--r--jjb/ccsdk/platform-nbapi.yaml3
-rw-r--r--jjb/ccsdk/platform-plugins.yaml3
-rw-r--r--jjb/ccsdk/sli-adaptors.yaml3
-rw-r--r--jjb/ccsdk/sli-core.yaml3
-rw-r--r--jjb/ccsdk/sli-northbound.yaml3
-rw-r--r--jjb/ccsdk/sli-plugins.yaml3
-rw-r--r--jjb/ccsdk/storage-pgaas.yaml3
-rw-r--r--jjb/ccsdk/utils.yaml3
-rw-r--r--jjb/clamp/clamp.yaml1
-rw-r--r--jjb/cli/cli.yaml3
-rw-r--r--jjb/dcaegen2/apod-analytics.yaml12
-rw-r--r--jjb/demo/demo.yaml3
-rw-r--r--jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml3
-rw-r--r--jjb/dmaap/dmaap-messagerouter-docker.yaml3
-rw-r--r--jjb/dmaap/dmaap-messagerouter-messageservice.yaml3
-rw-r--r--jjb/dmaap/dmaap-messagerouter-mirroragent.yaml3
-rw-r--r--jjb/dmaap/dmaap-messagerouter-msgrtr.yaml3
-rw-r--r--jjb/global-defaults.yaml2
m---------jjb/global-jjb0
-rw-r--r--jjb/global-templates-java.yaml78
-rw-r--r--jjb/global-templates-script.yaml34
-rw-r--r--jjb/holmes/holmes-common.yaml3
-rw-r--r--jjb/holmes/holmes-dsa.yaml3
-rw-r--r--jjb/holmes/holmes-engine-mgt.yaml3
-rw-r--r--jjb/holmes/holmes-rule-mgt.yaml3
-rwxr-xr-xjjb/include-docker-push.sh4
-rw-r--r--jjb/integration/integration.yaml10
-rw-r--r--jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml15
-rw-r--r--jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml10
-rw-r--r--jjb/modeling/modeling-toscaparsers-nfvparser.yaml4
-rw-r--r--jjb/msb/msb-apigateway.yaml3
-rw-r--r--jjb/msb/msb-discovery.yaml3
-rw-r--r--jjb/msb/msb-java-sdk.yaml3
-rw-r--r--jjb/msb/msb-swagger-sdk.yaml3
-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/multicloud/multicloud-openstack-vmware-vesagent-python.yaml16
-rw-r--r--jjb/oom/oom-registrator.yaml3
-rw-r--r--jjb/policy/policy-api.yaml3
-rw-r--r--jjb/policy/policy-common.yaml3
-rw-r--r--jjb/policy/policy-drools-applications.yaml3
-rw-r--r--jjb/policy/policy-drools-pdp.yaml4
-rw-r--r--jjb/policy/policy-engine.yaml3
-rw-r--r--jjb/policy/policy-gui.yaml3
-rw-r--r--jjb/policy/policy-pap.yaml3
-rw-r--r--jjb/policy/policy-pdp.yaml3
-rw-r--r--jjb/portal-sdk/portal-sdk.yaml (renamed from jjb/portal/portal-sdk.yaml)4
-rw-r--r--jjb/portal/portal-docker.yaml20
-rw-r--r--jjb/portal/portal.yaml2
-rw-r--r--jjb/sdc/sdc-csit.yaml11
-rw-r--r--jjb/sdc/sdc-jtosca.yaml3
-rw-r--r--jjb/sdc/sdc-sdc-distribution-client.yaml3
-rw-r--r--jjb/sdc/sdc-sdc-titan-cassandra.yaml3
-rw-r--r--jjb/sdc/sdc-sdc-tosca.yaml3
-rw-r--r--jjb/sdc/sdc-sdc-workflow-designer.yaml3
-rw-r--r--jjb/sdnc/sdnc-adaptors.yaml3
-rw-r--r--jjb/sdnc/sdnc-core.yaml3
-rw-r--r--jjb/sdnc/sdnc-northbound.yaml3
-rw-r--r--jjb/sdnc/sdnc-oam.yaml3
-rw-r--r--jjb/sdnc/sdnc-plugins.yaml3
-rw-r--r--jjb/so/so-libs.yaml3
-rw-r--r--jjb/ui/ui-dmaapbc.yaml5
-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/vid/vid-asdcclient.yaml3
-rw-r--r--jjb/vid/vid-csit.yaml2
-rw-r--r--jjb/vid/vid.yaml3
-rw-r--r--jjb/vnfsdk/vnfsdk-refrepo.yaml3
-rw-r--r--jjb/vnfsdk/vnfsdk-validation.yaml3
-rw-r--r--jjb/vvp/vvp-engagementmgr.yaml1
101 files changed, 303 insertions, 206 deletions
diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml
index 609aab3ba..754fbddd3 100644
--- a/jjb/aaf/aaf-authz-docker.yaml
+++ b/jjb/aaf/aaf-authz-docker.yaml
@@ -4,7 +4,8 @@
name: aaf-authz-docker
project-name: 'aaf-authz-docker'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-verify-java-checkstyle'
- '{project-name}-{stream}-merge-properties-java':
mvn_properties:
@@ -17,6 +18,7 @@
- skipDockerTag=true
- skipDockerPush=true
- '{project-name}-{stream}-docker-java-properties-daily':
+ setVersion: 'DontSetVersion'
docker-pom: 'authz-service/pom.xml'
mvn-profile: 'docker'
maven-properties: |
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 4e172a6e5..89eb4289b 100644
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -3,7 +3,8 @@
name: aaf-authz
project-name: 'aaf-authz'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..d8037596d 100644
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -3,7 +3,8 @@
name: aaf-cadi
project-name: 'aaf-cadi'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..22d8a2231 100644
--- a/jjb/aaf/aaf-inno.yaml
+++ b/jjb/aaf/aaf-inno.yaml
@@ -3,7 +3,8 @@
name: aaf-inno
project-name: 'aaf-inno'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..403ddd00c 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -3,7 +3,8 @@
name: aai-aai-common
project-name: 'aai-aai-common'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..496f299e7 100644
--- a/jjb/aai/aai-aai-service.yaml
+++ b/jjb/aai/aai-aai-service.yaml
@@ -3,7 +3,8 @@
name: aai-aai-service
project-name: 'aai-aai-service'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..30162c76a 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -3,7 +3,8 @@
name: aai-babel
project-name: 'aai-babel'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..ce859701c 100644
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -3,7 +3,8 @@
name: aai-champ
project-name: 'aai-champ'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..125ec0e92 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -3,7 +3,8 @@
name: aai-data-router
project-name: 'aai-data-router'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..e2efa919a 100644
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -3,7 +3,8 @@
name: aai-esr-gui
project-name: 'aai-esr-gui'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..2f7076ba4 100644
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -3,7 +3,8 @@
name: aai-esr-server
project-name: 'aai-esr-server'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..8aa510ac9 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -3,7 +3,8 @@
name: aai-logging-service
project-name: 'aai-logging-service'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..f62c8d775 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -3,7 +3,8 @@
name: aai-model-loader
project-name: 'aai-model-loader'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-java-daily'
@@ -14,8 +15,6 @@
stream:
- 'master':
branch: 'master'
- - 'release-1.0.0':
- branch: 'release-1.0.0'
mvn-settings: 'aai-model-loader-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index b2c1bd51a..0f466e69e 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -3,7 +3,8 @@
name: aai-resources
project-name: 'aai-resources'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..51374a20a 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -3,7 +3,8 @@
name: aai-rest-client
project-name: 'aai-rest-client'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..17323195e 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -3,7 +3,8 @@
name: aai-router-core
project-name: 'aai-router-core'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..6d32697b5 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -3,7 +3,8 @@
name: aai-search-data-service
project-name: 'aai-search-data-service'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..2b5b17498 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -3,7 +3,8 @@
name: aai-sparky-be
project-name: 'aai-sparky-be'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..fd1b330e6 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -4,7 +4,8 @@
project-name: 'aai-sparky-fe'
build-node: 'centos7-basebuild-4c-4g'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..3803ca3ba 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -3,7 +3,8 @@
name: aai-traversal
project-name: 'aai-traversal'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..c6bd45f56 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -4,7 +4,8 @@
name: appc-deployment
project-name: 'appc-deployment'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..03e0245d5 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -3,7 +3,9 @@
name: appc-master
project-name: 'appc'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
+ build-timeout: 60
- '{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..05a134d9a 100644
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -3,7 +3,8 @@
name: ccsdk-dashboard
project-name: 'ccsdk-dashboard'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 21f7759b8..a77f6a3c9 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -3,7 +3,8 @@
name: ccsdk-distribution
project-name: 'ccsdk-distribution'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..d1a4204b6 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -3,7 +3,8 @@
name: ccsdk-parent
project-name: 'ccsdk-parent'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..771087aaf 100644
--- a/jjb/ccsdk/platform-nbapi.yaml
+++ b/jjb/ccsdk/platform-nbapi.yaml
@@ -3,7 +3,8 @@
name: ccsdk-platform-nbapi
project-name: 'ccsdk-platform-nbapi'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..1fc194a5f 100644
--- a/jjb/ccsdk/platform-plugins.yaml
+++ b/jjb/ccsdk/platform-plugins.yaml
@@ -3,7 +3,8 @@
name: ccsdk-platform-plugins
project-name: 'ccsdk-platform-plugins'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..cc51531c0 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -3,7 +3,8 @@
name: ccsdk-sli-adaptors
project-name: 'ccsdk-sli-adaptors'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..16beca1f5 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -3,7 +3,8 @@
name: ccsdk-sli-core
project-name: 'ccsdk-sli-core'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..1f7c4a884 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -3,7 +3,8 @@
name: ccsdk-sli-northbound
project-name: 'ccsdk-sli-northbound'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..120ecec62 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -3,7 +3,8 @@
name: ccsdk-sli-plugins
project-name: 'ccsdk-sli-plugins'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..ba8327aaa 100644
--- a/jjb/ccsdk/storage-pgaas.yaml
+++ b/jjb/ccsdk/storage-pgaas.yaml
@@ -3,7 +3,8 @@
name: ccsdk-storage-pgaas
project-name: 'ccsdk-storage-pgaas'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..6613e874c 100644
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -3,7 +3,8 @@
name: ccsdk-utils
project-name: 'ccsdk-utils'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index da9bc2548..746caa0ea 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -16,6 +16,7 @@
- skipDockerTag=true
- skipDockerPush=true
- '{project-name}-{stream}-docker-java-properties-daily':
+ setVersion: 'DoSetVersion'
docker-pom: 'pom.xml'
mvn-profile: 'docker'
maven-properties: |
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index 896198f5e..03180f440 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -4,7 +4,8 @@
name: cli
project-name: 'cli'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..226d861b9 100644
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -4,7 +4,8 @@
name: demo
project-name: 'demo'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..4a08f7f73 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -3,7 +3,8 @@
name: dmaap-messagerouter-dmaapclient
project-name: 'dmaap-messagerouter-dmaapclient'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..498ddba0b 100644
--- a/jjb/dmaap/dmaap-messagerouter-docker.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml
@@ -4,7 +4,8 @@
name: dmaap-messagerouter-docker
project-name: 'dmaap-messagerouter-docker'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..f275a4f2c 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -3,7 +3,8 @@
name: dmaap-messagerouter-messageservice
project-name: 'dmaap-messagerouter-messageservice'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..10d6169ba 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -3,7 +3,8 @@
name: dmaap-messagerouter-mirroragent
project-name: 'dmaap-messagerouter-mirroragent'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..a7b0b8094 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -3,7 +3,8 @@
name: dmaap-messagerouter-msgrtr
project-name: 'dmaap-messagerouter-msgrtr'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..7ec69c6ad 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -43,4 +43,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-jjb b/jjb/global-jjb
-Subproject 21f2869c8f8ac7b2b21130eb16231a8df2904f5
+Subproject c38dce2088f0833b94b8811bbd1efc3e74e8b06
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index db06431ab..c8d566500 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
@@ -1518,6 +1458,22 @@
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
+ - conditional-step:
+ condition-kind: regex-match
+ regex: DoSetVersion
+ label: '{setVersion}'
+ steps:
+ - inject:
+ properties-file: version.properties
+ - maven-target:
+ maven-version: '{maven-version}'
+ goals: 'versions:set versions:update-child-modules versions:commit -B'
+ properties:
+ - 'newVersion=${{release_version}}'
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
- docker-login
- maven-docker-push-daily:
maven-version: '{maven-version}'
@@ -2333,7 +2289,7 @@
- maven-target:
maven-version: '{maven-version}'
pom: '{site-pom}'
- goals: 'clean site:site site:stage-deploy'
+ goals: 'clean site:site site:stage-deploy -B'
settings: '{mvn-settings}'
settings-type: cfp
global-settings: 'global-settings'
diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index c2da1cd9e..991ffd69a 100644
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -752,14 +752,14 @@
# vim: sw=2 ts=2 sts=2 et :
- job-template:
- # Job template for scm and script trigger - for docker merge
+ # Job template for two scm and script trigger - for docker merge
#
# Required Variables:
# branch: git branch
# build-node: what build node to run on
# script: build script to execute
- name: '{project-name}-{stream}-merge-docker-script'
+ name: '{project-name}-{stream}-two-scm-merge-docker-script'
project-type: freestyle
concurrent: true
@@ -784,15 +784,10 @@
choosing-strategy: 'default'
submodule-recursive: '{submodule-recursive}'
- git-extra-project:
- project: '{extra-project1}'
- refspec: '{extra-refspec1}'
- branch: '{extra-branch1}'
- checkout-dir: '{checkout-dir1}'
- - git-extra-project:
- project: '{extra-project2}'
- refspec: '{extra-refspec2}'
- branch: '{extra-branch2}'
- checkout-dir: '{checkout-dir2}'
+ project: '{extra-project}'
+ refspec: '{extra-refspec}'
+ branch: '{extra-branch}'
+ checkout-dir: '{checkout-dir}'
wrappers:
- infra-wrappers:
@@ -825,14 +820,14 @@
maven-version: '{maven-version}'
- job-template:
- # Job template for scm and script trigger - for docker daily release
+ # Job template for two scm and script trigger - for docker daily release
#
# Required Variables:
# branch: git branch
# build-node: what build node to run on
# script: build script to execute
- name: '{project-name}-{stream}-release-docker-script-manual'
+ name: '{project-name}-{stream}-two-scm-release-docker-script-manual'
project-type: freestyle
concurrent: true
@@ -857,15 +852,10 @@
choosing-strategy: 'default'
submodule-recursive: '{submodule-recursive}'
- git-extra-project:
- project: '{extra-project1}'
- refspec: '{extra-refspec1}'
- branch: '{extra-branch1}'
- checkout-dir: '{checkout-dir1}'
- - git-extra-project:
- project: '{extra-project2}'
- refspec: '{extra-refspec2}'
- branch: '{extra-branch2}'
- checkout-dir: '{checkout-dir2}'
+ project: '{extra-project}'
+ refspec: '{extra-refspec}'
+ branch: '{extra-branch}'
+ checkout-dir: '{checkout-dir}'
wrappers:
- infra-wrappers:
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index 7a6f273fe..4b2fa3194 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -3,7 +3,8 @@
name: holmes-common
project-name: 'holmes-common'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..592cfd84f 100644
--- a/jjb/holmes/holmes-dsa.yaml
+++ b/jjb/holmes/holmes-dsa.yaml
@@ -3,7 +3,8 @@
name: holmes-dsa
project-name: 'holmes-dsa'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..5e1077682 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -3,7 +3,8 @@
name: holmes-engine-management
project-name: 'holmes-engine-management'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..d88aef4ef 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -3,7 +3,8 @@
name: holmes-rule-management
project-name: 'holmes-rule-management'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh
index df42fa7b9..c0394de81 100755
--- a/jjb/include-docker-push.sh
+++ b/jjb/include-docker-push.sh
@@ -29,12 +29,12 @@ if [ ! -z "$DOCKER_IMAGE_NAME" ]; then
# tag image with nexus3 proxy prefix
docker tag ${DOCKER_IMAGE_NAME} $REPO_PATH
elif [[ $PROJECT =~ $SEARCH ]] ; then
- REPO_PATH=$DOCKER_REPOSITORY/openecomp/ajsc-aai;
+ REPO_PATH=$DOCKER_REPOSITORY/onap/ajsc-aai;
else
# Cut the prefix aai/ in example aai/model-loader
DOCKER_REPO_NAME=$(echo ${PROJECT} | cut -d"/" -f2-);
- REPO_PATH=$DOCKER_REPOSITORY/openecomp/${DOCKER_REPO_NAME};
+ REPO_PATH=$DOCKER_REPOSITORY/onap/${DOCKER_REPO_NAME};
fi
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-csit.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml
new file mode 100644
index 000000000..b40bd84b1
--- /dev/null
+++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml
@@ -0,0 +1,15 @@
+---
+
+- project:
+ name: modeling-toscaparsers-javatoscachecker-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'modeling-toscaparsers-javatoscachecker'
+ stream: 'master'
+ functionality:
+ - 'APIs':
+ trigger_jobs:
+ - '{project-name}-{stream}-release-java-daily'
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
index 892a99cb4..5205d2c3c 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/**'
@@ -17,3 +17,11 @@
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-java-daily'
+ - '{project-name}-{stream}-docker-java-properties-daily':
+ setVersion: 'DontSetVersion'
+ docker-pom: 'javatoscachecker/pom.xml'
+ mvn-profile: 'docker'
+ maven-properties: |
+ skip.docker.build=false
+ skip.docker.tag=false
+ skip.docker.push=false
diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
index 799f85237..f7c03ea89 100644
--- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
+++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
@@ -15,8 +15,10 @@
pattern: 'nfvparser/**'
pom: 'nfvparser/pom.xml'
jobs:
- - '{project-name}-{stream}-clm'
- '{project-name}-{stream}-{subproject}-verify-python'
+ - gerrit-maven-clm:
+ java-version: ''
+ mvn-params: '-f nfvparser/pom.xml'
- '{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..1035ec206 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -3,7 +3,8 @@
name: msb-apigateway
project-name: 'msb-apigateway'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..5f5702a25 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -3,7 +3,8 @@
name: msb-discovery
project-name: 'msb-discovery'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..7bacfd9cd 100644
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -3,7 +3,8 @@
name: msb-java-sdk
project-name: 'msb-java-sdk'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..90b12b16a 100644
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -3,7 +3,8 @@
name: msb-swagger-sdk
project-name: 'msb-swagger-sdk'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..1d4fa6b33
--- /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}-{subproject}-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/multicloud/multicloud-openstack-vmware-vesagent-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml
new file mode 100644
index 000000000..0a8fcd4a0
--- /dev/null
+++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml
@@ -0,0 +1,16 @@
+---
+- project:
+ name: multicloud-openstack-vmware-vesagent-python
+ project-name: 'multicloud-openstack-vmware-vesagent'
+ project: 'multicloud/openstack/vmware'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'multicloud-openstack-vmware-settings'
+ build-node: 'ubuntu1604-basebuild-4c-4g'
+ subproject:
+ - 'vesagent':
+ path: 'vesagent'
+ pattern: 'vesagent/**'
+ jobs:
+ - '{project-name}-{stream}-{subproject}-verify-python'
diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml
index a0e9bc0fc..3f2088cd2 100644
--- a/jjb/oom/oom-registrator.yaml
+++ b/jjb/oom/oom-registrator.yaml
@@ -3,7 +3,8 @@
name: oom-registrator
project-name: 'oom-registrator'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..131695e6f 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -3,7 +3,8 @@
name: policy-api
project-name: 'policy-api'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..2df702731 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -3,7 +3,8 @@
name: policy-common
project-name: 'policy-common'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..44c6608da 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -3,7 +3,8 @@
name: policy-drools-applications
project-name: 'policy-drools-applications'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..7dce80e3c 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -3,7 +3,9 @@
name: policy-drools-pdp
project-name: 'policy-drools-pdp'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
+ mvn-params: '-DskipTests'
- '{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..9f786d341 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -3,7 +3,8 @@
name: policy-engine
project-name: 'policy-engine'
jobs:
- - '{project-name}-{stream}-clm':
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..fb3206a4a 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -3,7 +3,8 @@
name: policy-gui
project-name: 'policy-gui'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..c0407e965 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -3,7 +3,8 @@
name: policy-pap
project-name: 'policy-pap'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..31c7b5bff 100644
--- a/jjb/policy/policy-pdp.yaml
+++ b/jjb/policy/policy-pdp.yaml
@@ -3,7 +3,8 @@
name: policy-pdp
project-name: 'policy-pdp'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/portal/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index 63304419d..30e3ba391 100644
--- a/jjb/portal/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -21,8 +21,8 @@
stream:
- 'master':
branch: 'master'
- - 'release-1.3.0':
- branch: 'release-1.3.0'
+ - 'release-1.3.1':
+ branch: 'release-1.3.1'
mvn-settings: 'portal-sdk-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml
index 712e490e2..71edff8d7 100644
--- a/jjb/portal/portal-docker.yaml
+++ b/jjb/portal/portal-docker.yaml
@@ -4,28 +4,26 @@
name: portal-docker
project-name: 'portal-docker'
jobs:
- - '{project-name}-{stream}-three-scm-verify-script':
+ - '{project-name}-{stream}-two-scm-verify-script':
script:
!include-raw-escape: 'docker-build-deploy.sh'
- - '{project-name}-{stream}-merge-docker-script':
+ - '{project-name}-{stream}-two-scm-merge-docker-script':
script:
!include-raw-escape: 'docker-build-push.sh'
- - '{project-name}-{stream}-release-docker-script-manual':
+ - '{project-name}-{stream}-two-scm-release-docker-script-manual':
script:
!include-raw-escape: 'docker-build-release.sh'
project: 'portal'
stream:
- 'master':
branch: 'master'
+ - 'release-1.3.0':
+ branch: 'release-1.3.0'
mvn-settings: 'portal-settings'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-docker-8c-8g
- extra-project1: 'portal/sdk'
- extra-branch1: '{branch}'
- extra-refspec1: 'refs/heads/{branch}'
- checkout-dir1: 'sdk'
- extra-project2: 'ui/dmaapbc'
- extra-branch2: '{branch}'
- extra-refspec2: 'refs/heads/{branch}'
- checkout-dir2: 'dmaapbc'
+ extra-project: 'portal/sdk'
+ extra-branch: '{branch}'
+ extra-refspec: 'refs/heads/{branch}'
+ checkout-dir: 'sdk'
diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index ef05814cc..493136620 100644
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'release-1.3.0':
+ branch: 'release-1.3.0'
mvn-settings: 'portal-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index 196c2938e..69cfe9dc7 100644
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -5,10 +5,17 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'sdc'
- stream: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'release-1.1.0':
+ branch: 'release-1.1.0'
functionality:
- 'sanity':
trigger_jobs:
- - '{project-name}-{stream}-release-java-daily-checkstyle'
+ - '{project-name}-{stream}-sdc-merge-java'
+ - 'nightly':
+ trigger_jobs:
+ - '{project-name}-{stream}-docker-version-java-daily'
robot-options: ''
branch: 'master'
diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index 38fbcd401..7cd609411 100644
--- a/jjb/sdc/sdc-jtosca.yaml
+++ b/jjb/sdc/sdc-jtosca.yaml
@@ -4,7 +4,8 @@
name: sdc-jtosca
project-name: 'sdc-jtosca'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..186ae142e 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -4,7 +4,8 @@
name: sdc-sdc-distribution-client
project-name: 'sdc-sdc-distribution-client'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..df39d9289 100644
--- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml
+++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml
@@ -4,7 +4,8 @@
name: sdc-sdc-titan-cassandra
project-name: 'sdc-sdc-titan-cassandra'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..4381189b4 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -4,7 +4,8 @@
name: sdc-sdc-tosca
project-name: 'sdc-sdc-tosca'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..139ac95fa 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -3,7 +3,8 @@
name: sdc-sdc-workflow-designer
project-name: 'sdc-sdc-workflow-designer'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..3a8b5b5c5 100644
--- a/jjb/sdnc/sdnc-adaptors.yaml
+++ b/jjb/sdnc/sdnc-adaptors.yaml
@@ -3,7 +3,8 @@
name: sdnc-adaptors
project-name: 'sdnc-adaptors'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..17ee14fd2 100644
--- a/jjb/sdnc/sdnc-core.yaml
+++ b/jjb/sdnc/sdnc-core.yaml
@@ -7,7 +7,8 @@
pom: 'rootpom/pom.xml'
pattern: 'rootpom/**'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..24ceeb55c 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -3,7 +3,8 @@
name: sdnc-northbound
project-name: 'sdnc-northbound'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..4f8a83f8d 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -4,7 +4,8 @@
name: sdnc-oam
project-name: 'sdnc-oam'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..1e62e70cd 100644
--- a/jjb/sdnc/sdnc-plugins.yaml
+++ b/jjb/sdnc/sdnc-plugins.yaml
@@ -3,7 +3,8 @@
name: sdnc-plugins
project-name: 'sdnc-plugins'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..cf266a522 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -3,7 +3,8 @@
name: so-libs
project-name: 'so-libs'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..9f7d0f785 100644
--- a/jjb/ui/ui-dmaapbc.yaml
+++ b/jjb/ui/ui-dmaapbc.yaml
@@ -4,7 +4,8 @@
project-name: 'ui-dmaapbc'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -16,8 +17,6 @@
stream:
- 'master':
branch: 'master'
- - 'release-1.0.0':
- branch: 'release-1.0.0'
- 'release-1.1.0':
branch: 'release-1.1.0'
mvn-settings: 'ui-dmaapbc-settings'
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..d995db4dc 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-version-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..cc2c8650b 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-version-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..c14b7a9c2 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-version-java-daily'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vid/vid-asdcclient.yaml b/jjb/vid/vid-asdcclient.yaml
index 406f211fb..d8f09de9e 100644
--- a/jjb/vid/vid-asdcclient.yaml
+++ b/jjb/vid/vid-asdcclient.yaml
@@ -3,7 +3,8 @@
name: vid-asdcclient
project-name: 'vid-asdcclient'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml
index 46e1688ed..b1124ab70 100644
--- a/jjb/vid/vid-csit.yaml
+++ b/jjb/vid/vid-csit.yaml
@@ -9,6 +9,6 @@
functionality:
- 'healthCheck':
trigger_jobs:
- - '{project-name}-{stream}-release-java-daily-checkstyle'
+ - '{project-name}-{stream}-docker-version-java-daily'
robot-options: ''
branch: 'master'
diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 33a7f2851..c8438e0d8 100644
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -3,7 +3,8 @@
name: vid
project-name: 'vid'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..853a8b59d 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -3,7 +3,8 @@
name: vnfsdk-refrepo
project-name: 'vnfsdk-refrepo'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{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..1d2855631 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -3,7 +3,8 @@
name: vnfsdk-validation
project-name: 'vnfsdk-validation'
jobs:
- - '{project-name}-{stream}-clm'
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/vvp/vvp-engagementmgr.yaml b/jjb/vvp/vvp-engagementmgr.yaml
index fd8b7c43f..a98685b9b 100644
--- a/jjb/vvp/vvp-engagementmgr.yaml
+++ b/jjb/vvp/vvp-engagementmgr.yaml
@@ -15,5 +15,6 @@
build-node: ubuntu1604-basebuild-4c-4g
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
+ - '{project-name}-{stream}-docker-java-daily'
docker-pom: 'pom.xml'
mvn-profile: 'default'