summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/aai/aai-aai-common.yaml2
-rw-r--r--jjb/aai/aai-csit.yaml4
-rw-r--r--jjb/aai/aai-data-router.yaml4
-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.yaml4
-rw-r--r--jjb/aai/aai-sparky-be.yaml4
-rw-r--r--jjb/aai/aai-sparky-fe.yaml2
-rw-r--r--jjb/aai/aai-traversal.yaml2
-rw-r--r--jjb/appc/appc-csit.yaml7
-rw-r--r--jjb/appc/appc-deployment.yaml2
-rw-r--r--jjb/appc/appc-master.yaml3
-rw-r--r--jjb/clamp/clamp.yaml4
-rw-r--r--jjb/cli/cli.yaml4
-rw-r--r--jjb/dcaegen2/apod-analytics.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-analytics.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-collectors-ves.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-collectors.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-csit.yaml7
-rw-r--r--jjb/dcaegen2/dcaegen2-deployments.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-blueprints.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-cli.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-configbinding.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-plugins.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2-platform.yaml18
-rw-r--r--jjb/dcaegen2/dcaegen2-utils.yaml2
-rw-r--r--jjb/dcaegen2/dcaegen2.yaml4
-rw-r--r--jjb/demo/demo.yaml2
-rw-r--r--jjb/doc/doc.yaml2
m---------jjb/global-jjb0
-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-csit.yaml7
-rw-r--r--jjb/integration/integration-docker.yaml2
-rw-r--r--jjb/integration/integration-macros.yaml16
-rw-r--r--jjb/integration/integration-templates-csit.yaml73
-rw-r--r--jjb/integration/integration.yaml2
-rw-r--r--jjb/modeling/modeling-toscaparsers-nfvparser.yaml2
-rw-r--r--jjb/oparent/oparent.yaml2
-rw-r--r--jjb/policy/policy-common.yaml2
-rw-r--r--jjb/policy/policy-docker.yaml2
-rw-r--r--jjb/policy/policy-drools-applications.yaml3
-rw-r--r--jjb/policy/policy-drools-pdp.yaml3
-rw-r--r--jjb/policy/policy-engine.yaml5
-rw-r--r--jjb/portal-sdk/portal-sdk.yaml2
-rw-r--r--jjb/portal/portal.yaml2
-rw-r--r--jjb/sdnc/sdnc-northbound.yaml2
-rw-r--r--jjb/sdnc/sdnc-oam.yaml2
-rw-r--r--jjb/so/so-libs.yaml2
-rw-r--r--jjb/so/so.yaml2
-rw-r--r--jjb/testsuite/testsuite-heatbridge-master.yaml2
-rw-r--r--jjb/testsuite/testsuite-python-testing-utils.yaml2
-rw-r--r--jjb/testsuite/testsuite.yaml2
-rw-r--r--jjb/usecaseui/usecase-ui-server.yaml2
-rw-r--r--jjb/usecaseui/usecase-ui.yaml2
-rw-r--r--jjb/vfc/vfc-gvnfm-vnflcm-java.yaml6
-rw-r--r--jjb/vfc/vfc-gvnfm-vnflcm-python.yaml2
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml6
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml2
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfres-java.yaml6
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfres-python.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-catalog.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-ems-java.yaml6
-rw-r--r--jjb/vfc/vfc-nfvo-driver-sfc.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml6
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml6
-rw-r--r--jjb/vfc/vfc-nfvo-lcm-java.yaml6
-rw-r--r--jjb/vfc/vfc-nfvo-resmanagement.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-wfengine-java.yaml4
-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/vvp/vvp-jenkins.yaml2
87 files changed, 318 insertions, 28 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 403ddd00c..faf4ea5cd 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-aai-common-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml
index 303aa5f5c..41ac0e9aa 100644
--- a/jjb/aai/aai-csit.yaml
+++ b/jjb/aai/aai-csit.yaml
@@ -17,4 +17,6 @@
trigger_jobs:
- 'aai-esr-server-{stream}-docker-java-daily'
robot-options: ''
- branch: 'master'
+ branch:
+ - 'master'
+ - 'amsterdam'
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index a3c15ee4a..ae83d7f80 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -15,6 +15,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-data-router-settings'
files: '**'
- archive-artifacts: '' \ No newline at end of file
+ archive-artifacts: ''
diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
index e2efa919a..face2b853 100644
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -14,6 +14,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-esr-gui-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index 2f7076ba4..ba7003956 100644
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -14,6 +14,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-esr-server-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index 8aa510ac9..948447db6 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -14,6 +14,8 @@
branch: 'master'
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-logging-service-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index ac761c518..0b2381d7b 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -15,6 +15,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-model-loader-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 0f466e69e..6caccad3b 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -19,6 +19,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-resources-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 51374a20a..c9dcd790b 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -12,6 +12,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-rest-client-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index 17323195e..d454d8c86 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -12,6 +12,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-router-core-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index de9af76f0..e6a67b694 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -15,6 +15,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-search-data-service-settings'
files: '**'
- archive-artifacts: '' \ No newline at end of file
+ archive-artifacts: ''
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 8f49eb3de..80b159662 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -15,6 +15,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-sparky-be-settings'
files: '**'
- archive-artifacts: '' \ No newline at end of file
+ archive-artifacts: ''
diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index fd1b330e6..bec805f26 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -13,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-sparky-fe-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 3803ca3ba..c8d8ec058 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -19,6 +19,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-traversal-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml
index 1a364df32..e257a8bc4 100644
--- a/jjb/appc/appc-csit.yaml
+++ b/jjb/appc/appc-csit.yaml
@@ -5,10 +5,13 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'appc'
- stream: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
functionality:
- 'healthcheck':
trigger_jobs:
- '{project-name}-{stream}-release-java-daily-checkstyle'
robot-options: ''
- branch: 'master'
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index c6bd45f56..782e6e253 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -17,6 +17,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'appc-deployment-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 19ef02097..34f7b376c 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -6,6 +6,7 @@
- gerrit-maven-clm:
java-version: ''
mvn-params: '-DskipTests'
+ build-timeout: 30
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -14,6 +15,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'appc-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index 746caa0ea..20776992a 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -4,6 +4,8 @@
name: clamp
project-name: 'clamp'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-verify-java-checkstyle'
- '{project-name}-{stream}-merge-properties-java':
mvn_properties:
@@ -29,6 +31,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'clamp-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index 723e96932..1c3905289 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -21,8 +21,8 @@
stream:
- 'master':
branch: 'master'
- - 'release-1.1.0':
- branch: 'release-1.1.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'cli-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml
index b7609bdea..4e6f2f3c6 100644
--- a/jjb/dcaegen2/apod-analytics.yaml
+++ b/jjb/dcaegen2/apod-analytics.yaml
@@ -7,6 +7,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
# apply to all jobs
project: 'dcaegen2/analytics/tca'
diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml
index 27feb20e7..5edbd1eeb 100644
--- a/jjb/dcaegen2/dcaegen2-analytics.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'dcaegen2-analytics-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 1990c0c63..4053148c3 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index f310f5bad..4f03d9939 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'dcaegen2-collectors-ves-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml
index 87e4fd467..c0b39cb35 100644
--- a/jjb/dcaegen2/dcaegen2-collectors.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'dcaegen2-collectors-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-csit.yaml b/jjb/dcaegen2/dcaegen2-csit.yaml
index f4e5d001c..cf22f35d6 100644
--- a/jjb/dcaegen2/dcaegen2-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-csit.yaml
@@ -4,11 +4,14 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'dcaegen2'
- stream: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
functionality:
- 'testsuites':
trigger_jobs:
- 'dcaegen2-master-merge-java'
- 'dcaegen2-collectors-ves-master-merge-java'
robot-options: ''
- branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index 91ac246ab..deaab94fd 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'dcaegen2-deployments-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
index d34c32167..ab047d53f 100644
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'dcaegen2-platform-blueprints-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml
index 072e51031..ce4f8484b 100644
--- a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'dcaegen2-platform-cdapbroker-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
index 043f40f6c..19460414d 100644
--- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'dcaegen2-platform-cli-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index af78dabfc..6109812b9 100644
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'dcaegen2-platform-configbinding-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
index a8fd36dc3..3c21e9b42 100644
--- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 14a67224d..543c627b1 100644
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -15,6 +15,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'dcaegen2-platform-inventory-api-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
index 5be499843..560713812 100644
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'dcaegen2-platform-plugins-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index 9e683cb03..ccff1c56c 100644
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'dcaegen2-platform-policy-handler-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
index 1ec9e9580..e2821a90d 100644
--- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
@@ -15,6 +15,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml
index 1e8120e28..ce12261f5 100644
--- a/jjb/dcaegen2/dcaegen2-platform.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform.yaml
@@ -11,11 +11,13 @@
stream:
- 'master':
branch: 'master'
- mvn-settings: 'dcaegen2-platform-settings'
- # due to a strange macro / variable translation problem this needs
- # to be passed as a string block to properly get the properties
- # correctly defined in the job
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
+ - 'amsterdam':
+ branch: 'amsterdam'
+ mvn-settings: 'dcaegen2-platform-settings'
+ # due to a strange macro / variable translation problem this needs
+ # to be passed as a string block to properly get the properties
+ # correctly defined in the job
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 2d7e4319f..3f4f16124 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'dcaegen2-utils-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index e93bbd141..6fb6fccc1 100644
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -3,6 +3,8 @@
name: dcaegen2
project-name: 'dcaegen2'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
@@ -11,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'dcaegen2-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index 226d861b9..cebe89552 100644
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -14,6 +14,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
- 'release-1.0.0':
branch: 'release-1.0.0'
mvn-settings: 'demo-settings'
diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index b8c33dfa2..adba3e9d2 100644
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -16,3 +16,5 @@
stream:
- master:
branch: 'master'
+ - amsterdam:
+ branch: 'amsterdam'
diff --git a/jjb/global-jjb b/jjb/global-jjb
-Subproject cda2ec16956502d39e9cffb1843987c03aca8c0
+Subproject 98512a2a3e4aacecc5834f4d3b51d8c5333045f
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index 4b2fa3194..9e1a46a8f 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -13,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'holmes-common-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml
index 592cfd84f..8f99cce1b 100644
--- a/jjb/holmes/holmes-dsa.yaml
+++ b/jjb/holmes/holmes-dsa.yaml
@@ -14,6 +14,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'holmes-dsa-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index 5e1077682..9a05cde6b 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -14,6 +14,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'holmes-engine-management-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index d88aef4ef..5b28e2e4b 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -14,6 +14,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'holmes-rule-management-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml
index 5c5d39cdf..f4c2afc25 100644
--- a/jjb/integration/integration-csit.yaml
+++ b/jjb/integration/integration-csit.yaml
@@ -5,11 +5,14 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'integration'
- stream: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
functionality:
- 'functionality1':
trigger_jobs:
- 'vCPE':
trigger_jobs:
robot-options: ''
- branch: 'master'
diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index 92125d4ff..2730cbbf1 100644
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -9,6 +9,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
subproject:
- 'sniroemulator':
pom: 'test/mocks/sniroemulator/pom.xml'
diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index c3f05429e..781e3763d 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -15,6 +15,22 @@
default: '{test-options}'
description: 'Robot command options'
+- parameter:
+ name: html-publisher-dir
+ parameters:
+ - string:
+ name: HTMLDIR
+ default: '{html-dir}'
+ description: 'Directory location to be used by HTML publisher plugin'
+
+- parameter:
+ name: html-publisher-files
+ parameters:
+ - string:
+ name: HTMLFILES
+ default: '{html-files}'
+ description: 'File name to be used by HTML publisher plugin to produce the report'
+
- builder:
name: integration-install-robotframework
builders:
diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 4018309d9..504ee17c1 100644
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -54,6 +54,79 @@
- lf-infra-publish
- job-template:
+ name: '{project-name}-{stream}-verify-csit-{functionality}-testng'
+ disabled: false
+
+ project-type: freestyle
+ build-node: 'ubuntu1604-docker-8c-8g'
+ node: '{build-node}'
+
+ properties:
+ - lf-infra-properties:
+ project: 'integration'
+ build-days-to-keep: '{build-days-to-keep}'
+
+ parameters:
+ - infra-parameters:
+ project: 'integration'
+ branch: '{branch}'
+ refspec: 'refs/heads/{branch}'
+ artifacts: '{archive-artifacts}'
+ - integration-test-plan:
+ test-plan: 'plans/{project-name}/{functionality}'
+ - integration-test-options:
+ test-options: '{robot-options}'
+ - html-publisher-dir:
+ html-dir: '{html-dir}'
+ - html-publisher-files:
+ html-files: '{html-files}'
+
+ scm:
+ - gerrit-trigger-scm:
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+ submodule-recursive: '{submodule-recursive}'
+
+ wrappers:
+ - lf-infra-wrappers:
+ build-timeout: '{build-timeout}'
+ jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+ triggers:
+ - gerrit-trigger-patch-submitted:
+ server: '{server-name}'
+ project: 'integration'
+ branch: '{branch}'
+ files: 'test/csit/**/{project-name}/**'
+
+ builders:
+ - integration-install-robotframework
+ - inject:
+ properties-file: 'env.properties'
+ - integration-run-test
+
+ publishers:
+ - integration-robot:
+ unstable-if: 0.0
+ pass-if: 100.0
+ - lf-infra-publish
+ - testng:
+ pattern: archives/testng-results.xml
+ escape-test-description: true
+ escape-exception-msg: true
+ show-failed-builds: true
+ - html-publisher:
+ allow-missing: false
+ dir: '{html-dir}'
+ files: '{html-files}'
+ keep-all: false
+ link-to-last-build: false
+ name: ExtentReport
+ - junit:
+ results: archives/testng-results.xml
+ health-scale-factor: 1.0
+
+- job-template:
name: '{project-name}-{stream}-csit-{functionality}'
disabled: false
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index adfd8853e..816c006c9 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -14,6 +14,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'integration-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
index f7c03ea89..1140c2e56 100644
--- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
+++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
@@ -7,6 +7,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'modeling-toscaparsers-settings'
build-node: ubuntu1604-basebuild-4c-4g
subproject:
diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index be4ad0cac..ff6c9dc72 100644
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -17,6 +17,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'oparent-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 2df702731..a844d05e9 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -35,6 +35,8 @@
stream:
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'policy-common-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml
index 5f3b31dc3..f2b19e4a0 100644
--- a/jjb/policy/policy-docker.yaml
+++ b/jjb/policy/policy-docker.yaml
@@ -24,6 +24,8 @@
branch: 'master'
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'policy-docker-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 44c6608da..f463a2cef 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -35,6 +35,9 @@
stream:
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'policy-drools-applications-settings'
files: '**'
archive-artifacts: ''
+ build-node: 'ubuntu1604-basebuild-4c-4g'
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 7dce80e3c..ada359f0f 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -36,6 +36,9 @@
stream:
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'policy-drools-pdp-settings'
files: '**'
archive-artifacts: ''
+ build-node: 'ubuntu1604-basebuild-4c-4g'
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 9f786d341..ceb228eca 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -5,6 +5,7 @@
jobs:
- gerrit-maven-clm:
java-version: ''
+ build-timeout: 30
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
@@ -28,7 +29,6 @@
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
- '{project-name}-{stream}-stage-site-java':
- build-node: 'ubuntu1604-basebuild-4c-4g'
site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
@@ -36,6 +36,9 @@
stream:
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'policy-engine-settings'
files: '**'
archive-artifacts: ''
+ build-node: 'ubuntu1604-basebuild-4c-4g'
diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index 67a518a40..1653a7571 100644
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -21,6 +21,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
- 'release-1.3.1':
branch: 'release-1.3.1'
- 'release-1.3.2':
diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index e16aa1aa3..6d125fcfe 100644
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -3,6 +3,8 @@
name: portal
project-name: 'portal'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-release-java-daily'
- '{project-name}-{stream}-stage-site-java':
site-pom: 'pom.xml'
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 24ceeb55c..e78d50b53 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -13,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'sdnc-northbound-settings'
# due to a strange macro / variable translation problem this needs to be
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 4f8a83f8d..487ab04cc 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -17,6 +17,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'sdnc-oam-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index cf266a522..a21dd29d4 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'so-libs-settings'
# due to a strange macro / variable translation problem this needs to be
# passed as a string block to properly get the properties correctly defined
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 7278f0f7f..dbc4f2185 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -27,6 +27,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'so-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/testsuite/testsuite-heatbridge-master.yaml b/jjb/testsuite/testsuite-heatbridge-master.yaml
index ee9f5e686..576cfe6fb 100644
--- a/jjb/testsuite/testsuite-heatbridge-master.yaml
+++ b/jjb/testsuite/testsuite-heatbridge-master.yaml
@@ -13,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'testsuite-heatbridge-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml
index 516a177d8..01fca0d2e 100644
--- a/jjb/testsuite/testsuite-python-testing-utils.yaml
+++ b/jjb/testsuite/testsuite-python-testing-utils.yaml
@@ -14,6 +14,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
- 'release-1.0.0':
branch: 'release-1.0.0'
mvn-settings: 'testsuite-python-testing-utils-settings'
diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index 80897dbb9..0ff88fe94 100644
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -26,6 +26,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
- 'release-1.0.0':
branch: 'release-1.0.0'
mvn-settings: 'testsuite-settings'
diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index 727c60391..55e851bb4 100644
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -7,6 +7,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'usecase-ui-server-settings'
jobs:
- '{project-name}-{stream}-verify-java'
diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index 69c7f831c..3bb7d1fb3 100644
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -7,6 +7,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'usecase-ui-settings'
jobs:
- '{project-name}-{stream}-verify-java'
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index fc85d57c9..0d39d877c 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -7,12 +7,16 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'vfc-gvnfm-vnflcm-settings'
subproject:
- 'lcm':
pom: 'lcm/pom.xml'
pattern: 'lcm/**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
@@ -23,4 +27,4 @@
!include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g \ No newline at end of file
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
index 991848acb..cf623e2aa 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
@@ -7,6 +7,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'vfc-gvnfm-vnflcm-settings'
build-node: centos7-redis-4c-4g
subproject:
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 2aedb0faa..d3dbdd0e5 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -6,12 +6,16 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
subproject:
- 'mgr':
pom: 'mgr/pom.xml'
pattern: 'mgr/**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
@@ -22,4 +26,4 @@
!include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g \ No newline at end of file
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
index 9de9b0fea..eff84ad48 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
@@ -7,6 +7,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
build-node: ubuntu1604-basebuild-4c-4g
subproject:
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 22a103dad..bc84f2c9f 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -7,12 +7,16 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'vfc-gvnfm-vnfres-settings'
subproject:
- 'res':
pom: 'res/pom.xml'
pattern: 'res/**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
@@ -23,4 +27,4 @@
!include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g \ No newline at end of file
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
index db7762f3e..9a4866617 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
@@ -7,6 +7,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'vfc-gvnfm-vnfres-settings'
build-node: ubuntu1604-basebuild-4c-4g
subproject:
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index ec079cd97..8de899203 100644
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -7,12 +7,16 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'vfc-nfvo-catalog-settings'
subproject:
- 'catalog':
path: '.'
pattern: '**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index 5933f2160..fb0f5046f 100644
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -7,12 +7,16 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'vfc-nfvo-driver-ems-settings'
subproject:
- 'drv-ems-boco':
pom: 'ems/pom.xml'
pattern: 'ems/**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -23,4 +27,4 @@
!include-raw-escape: 'build-driver-ems-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g \ No newline at end of file
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index d995db4dc..a7fa3a849 100644
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -6,12 +6,16 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'vfc-nfvo-driver-sfc-settings'
subproject:
- 'driver-sfc-zte':
pom: 'zte/sfc-driver/pom.xml'
pattern: 'zte/sfc-driver/**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 81993319b..d91e4d854 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -7,12 +7,16 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
subproject:
- 'gvnfmadapter':
pom: 'gvnfmadapter/pom.xml'
pattern: 'gvnfmadapter/**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar'
@@ -23,4 +27,4 @@
!include-raw-escape: 'build-gvnfm-driver-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g \ No newline at end of file
+ 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 c14b7a9c2..e0f66f946 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
@@ -6,12 +6,16 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
subproject:
- 'drv-vnfm-nokia':
pom: 'nokia/vnfmdriver/pom.xml'
pattern: 'nokia/vnfmdriver/**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
index d35cc4d2f..2e3642fd9 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -7,15 +7,19 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
subproject:
- 'drv-vnfm-zte':
pom: 'zte/vmanager/pom.xml'
pattern: 'zte/vmanager/**'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g \ No newline at end of file
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index 2f0faed73..85812b0cc 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -7,8 +7,12 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'vfc-nfvo-lcm-settings'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
@@ -19,4 +23,4 @@
!include-raw-escape: 'build-nfvo-lcm-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g \ No newline at end of file
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 2dc778d16..b690f50da 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -8,8 +8,12 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
build-node: ubuntu1604-basebuild-4c-4g
jobs:
+ - 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/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index 570909b64..fb48ce0c3 100644
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -7,6 +7,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'vfc-nfvo-wfengine-settings'
subproject:
- 'engine-mgr-service':
@@ -20,6 +22,8 @@
script:
!include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh'
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
diff --git a/jjb/vid/vid-asdcclient.yaml b/jjb/vid/vid-asdcclient.yaml
index d8f09de9e..6069ec0cd 100644
--- a/jjb/vid/vid-asdcclient.yaml
+++ b/jjb/vid/vid-asdcclient.yaml
@@ -13,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'vid-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index c8438e0d8..4af5f3e88 100644
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -20,6 +20,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'vid-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 853a8b59d..6ff0a587a 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -20,6 +20,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'vnfsdk-refrepo-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml
index fefc29ce2..db77aa094 100644
--- a/jjb/vvp/vvp-jenkins.yaml
+++ b/jjb/vvp/vvp-jenkins.yaml
@@ -14,6 +14,8 @@
mvn-settings: 'vvp-jenkins-settings'
build-node: ubuntu1604-basebuild-4c-4g
jobs:
+ - gerrit-maven-clm:
+ java-version: ''
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-docker-java-daily'
docker-pom: 'pom.xml'