Merge "Update sdc jjb jobs"

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 403ddd0..faf4ea5 100644 (file)
--- 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 303aa5f..41ac0e9 100644 (file)
--- 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 a3c15ee..ae83d7f 100644 (file)
--- 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 e2efa91..face2b8 100644 (file)
--- 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 2f7076b..ba70039 100644 (file)
--- 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 8aa510a..948447d 100644 (file)
--- 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 ac761c5..0b2381d 100644 (file)
--- 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 0f466e6..6caccad 100644 (file)
--- 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 51374a2..c9dcd79 100644 (file)
--- 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 1732319..d454d8c 100644 (file)
--- 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 de9af76..e6a67b6 100644 (file)
--- 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 8f49eb3..80b1596 100644 (file)
--- 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 fd1b330..bec805f 100644 (file)
--- 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 3803ca3..c8d8ec0 100644 (file)
--- 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 1a364df..e257a8b 100644 (file)
--- 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-master.yaml b/jjb/appc/appc-master.yaml
index 82615fe..34f7b37 100644 (file)
--- 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'

diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index 746caa0..2077699 100644 (file)
--- 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 723e969..1c39052 100644 (file)
--- 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/dcaegen2-csit.yaml b/jjb/dcaegen2/dcaegen2-csit.yaml
index f4e5d00..cf22f35 100644 (file)
--- 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.yaml b/jjb/dcaegen2/dcaegen2.yaml
index b07b848..6fb6fcc 100644 (file)
--- 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'

diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
new file mode 100644 (file)
index 0000000..f18d863
--- /dev/null
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -0,0 +1,23 @@
+---
+- project:
+    name: dmaap-buscontroller
+    project-name: 'dmaap-buscontroller'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+          mvn-goals: 'clean install'
+    project: 'dmaap/buscontroller'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'release-1.0.0':
+          branch: 'release-1.0.0'
+    mvn-settings: 'dmaap-buscontroller-settings'
+    files: '**'
+    archive-artifacts: ''

diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
new file mode 100644 (file)
index 0000000..6ca5a06
--- /dev/null
+++ b/jjb/dmaap/dmaap-dbcapi.yaml
@@ -0,0 +1,23 @@
+---
+- project:
+    name: dmaap-dbcapi
+    project-name: 'dmaap-dbcapi'
+    jobs:
+      - gerrit-maven-clm:
+          java-version: ''
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+          mvn-goals: 'clean install'
+    project: 'dmaap/dbcapi'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'release-1.0.0':
+          branch: 'release-1.0.0'
+    mvn-settings: 'dmaap-dbcapi-settings'
+    files: '**'
+    archive-artifacts: ''

diff --git a/jjb/global-jjb b/jjb/global-jjb
index 98512a2..31ab691 160000 (submodule)
--- a/jjb/global-jjb
+++ b/jjb/global-jjb
@@ -1 +1 @@
-Subproject commit 98512a2a3e4aacecc5834f4d3b51d8c5333045ff
+Subproject commit 31ab6915b8c1b400172dae29d3bed0a9c8c700e1

diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index 4b2fa31..9e1a46a 100644 (file)
--- 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 592cfd8..8f99cce 100644 (file)
--- 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 5e10776..9a05cde 100644 (file)
--- 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 d88aef4..5b28e2e 100644 (file)
--- 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 5c5d39c..f4c2afc 100644 (file)
--- 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 92125d4..2730cbb 100644 (file)
--- 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-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index ac31050..dac4c28 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -122,6 +122,9 @@
           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}'

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index adfd885..816c006 100644 (file)
--- 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 f7c03ea..1140c2e 100644 (file)
--- 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/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index 1035ec2..1f65a36 100644 (file)
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -21,6 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'msb-apigateway-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index 5f5702a..5b38994 100644 (file)
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -20,6 +20,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'msb-discovery-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml
index 7bacfd9..b036e81 100644 (file)
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -12,6 +12,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'msb-java-sdk-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
index 90b12b1..fbae343 100644 (file)
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'msb-swagger-sdk-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index e16aa1a..6d125fc 100644 (file)
--- 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/so/so-libs.yaml b/jjb/so/so-libs.yaml
index cf266a5..a21dd29 100644 (file)
--- 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 7278f0f..dbc4f21 100644 (file)
--- 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/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index 727c603..55e851b 100644 (file)
--- 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 69c7f83..3bb7d1f 100644 (file)
--- 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 fc85d57..0d39d87 100644 (file)
--- 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 991848a..cf623e2 100644 (file)
--- 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 2aedb0f..d3dbdd0 100644 (file)
--- 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 9de9b0f..eff84ad 100644 (file)
--- 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 22a103d..bc84f2c 100644 (file)
--- 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 db7762f..9a48666 100644 (file)
--- 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 ec079cd..8de8992 100644 (file)
--- 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 5933f21..fb0f504 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -7,12 +7,16 @@
     stream:\r
       - 'master':\r
           branch: 'master'\r
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'vfc-nfvo-driver-ems-settings'\r
     subproject:\r
       - 'drv-ems-boco':\r
           pom: 'ems/pom.xml'\r
           pattern: 'ems/**'\r
     jobs:\r
+      - gerrit-maven-clm:
+          java-version: ''
       - '{project-name}-{stream}-{subproject}-verify-java'\r
       - '{project-name}-{stream}-{subproject}-merge-java'\r
       - '{project-name}-{stream}-release-version-java-daily'\r
@@ -23,4 +27,4 @@
             !include-raw-escape: 'build-driver-ems-docker-image.sh'\r
     files: '**'\r
     archive-artifacts: ''\r
-    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 d995db4..a7fa3a8 100644 (file)
--- 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 8199331..d91e4d8 100644 (file)
--- 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 c14b7a9..e0f66f9 100644 (file)
--- 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 d35cc4d..2e3642f 100644 (file)
--- 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 2f0faed..85812b0 100644 (file)
--- 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 2dc778d..b690f50 100644 (file)
--- 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 570909b..fb48ce0 100644 (file)
--- 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 d8f09de..6069ec0 100644 (file)
--- 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 c8438e0..4af5f3e 100644 (file)
--- 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/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml
index fefc29c..db77aa0 100644 (file)
--- 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'