Merge "Add arm64 docker build for AAF"
diff --git a/global-jjb b/global-jjb
index edc8300..64043e6 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit edc83001e85ae50e3694a4feb0236dfacc71d61e
+Subproject commit 64043e62f1c8ff53ff064cb832f2b68df4f08c43
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 2c943ff..832ed0d 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -11,6 +11,8 @@
mvn-goals: 'docker:build'
project: 'aai/babel'
stream:
+ - 'casablanca':
+ branch: 'casablanca'
- 'master':
branch: 'master'
mvn-settings: 'aai-babel-settings'
@@ -26,7 +28,7 @@
build-node: ubuntu1604-builder-4c-4g
project: 'aai/babel'
project-name: 'aai-babel'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-babel-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -37,7 +39,7 @@
- gerrit-maven-clm
project: 'aai/babel'
project-name: 'aai-babel'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-babel-settings'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml
index ddf37af..f9f7b5c 100644
--- a/jjb/aai/aai-chameleon.yaml
+++ b/jjb/aai/aai-chameleon.yaml
@@ -11,6 +11,8 @@
mvn-goals: 'clean package dockerfile:build dockerfile:push'
project: 'aai/chameleon'
stream:
+ - 'casablanca':
+ branch: 'casablanca'
- 'master':
branch: 'master'
mvn-settings: 'aai-chameleon-settings'
@@ -24,5 +26,5 @@
- gerrit-maven-clm
project: 'aai/chameleon'
project-name: 'aai-chameleon'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-chameleon-settings'
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index 4319869..bab7310 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -11,6 +11,8 @@
mvn-goals: 'docker:build'
project: 'aai/data-router'
stream:
+ - 'casablanca':
+ branch: 'casablanca'
- 'master':
branch: 'master'
mvn-settings: 'aai-data-router-settings'
@@ -25,7 +27,7 @@
build-node: ubuntu1604-builder-4c-4g
project: 'aai/data-router'
project-name: 'aai-data-router'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-data-router-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -36,5 +38,5 @@
- gerrit-maven-clm
project: 'aai/data-router'
project-name: 'aai-data-router'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-data-router-settings'
diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml
index a7996b1..5140c8f 100644
--- a/jjb/aai/aai-event-client.yaml
+++ b/jjb/aai/aai-event-client.yaml
@@ -8,6 +8,8 @@
- '{project-name}-{stream}-release-version-java-daily'
project: 'aai/event-client'
stream:
+ - 'casablanca':
+ branch: 'casablanca'
- 'master':
branch: 'master'
mvn-settings: 'aai-event-client-settings'
@@ -33,5 +35,5 @@
- gerrit-maven-clm
project: 'aai/event-client'
project-name: 'aai-event-client'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-event-client-settings'
diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml
index c85324d..74cee79 100644
--- a/jjb/aai/aai-gallifrey.yaml
+++ b/jjb/aai/aai-gallifrey.yaml
@@ -12,6 +12,8 @@
build-node: 'ubuntu1604-docker-8c-8g'
project: 'aai/gallifrey'
stream:
+ - 'casablanca':
+ branch: 'casablanca'
- 'master':
branch: 'master'
mvn-settings: 'aai-gallifrey-settings'
@@ -24,5 +26,5 @@
- gerrit-maven-clm
project: 'aai/gallifrey'
project-name: 'aai-gallifrey'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-gallifrey-settings'
diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml
index aea32fc..4984875 100644
--- a/jjb/aai/aai-gizmo.yaml
+++ b/jjb/aai/aai-gizmo.yaml
@@ -11,6 +11,8 @@
mvn-goals: 'docker:build'
project: 'aai/gizmo'
stream:
+ - 'casablanca':
+ branch: 'casablanca'
- 'master':
branch: 'master'
mvn-settings: 'aai-gizmo-settings'
@@ -26,7 +28,7 @@
build-node: ubuntu1604-builder-4c-4g
project: 'aai/gizmo'
project-name: 'aai-gizmo'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-gizmo-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -37,5 +39,5 @@
- gerrit-maven-clm
project: 'aai/gizmo'
project-name: 'aai-gizmo'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-gizmo-settings'
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index 1e5b9c6..fec75f9 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -8,6 +8,8 @@
- '{project-name}-{stream}-release-version-java-daily'
project: 'aai/logging-service'
stream:
+ - 'casablanca':
+ branch: 'casablanca'
- 'master':
branch: 'master'
mvn-settings: 'aai-logging-service-settings'
@@ -33,5 +35,5 @@
- gerrit-maven-clm
project: 'aai/logging-service'
project-name: 'aai-logging-service'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-logging-service-settings'
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 9eb253b..70c42a5 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -11,6 +11,8 @@
mvn-goals: 'docker:build'
project: 'aai/model-loader'
stream:
+ - 'casablanca':
+ branch: 'casablanca'
- 'master':
branch: 'master'
mvn-settings: 'aai-model-loader-settings'
@@ -26,7 +28,7 @@
build-node: ubuntu1604-builder-4c-4g
project: 'aai/model-loader'
project-name: 'aai-model-loader'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-model-loader-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -37,5 +39,5 @@
- gerrit-maven-clm
project: 'aai/model-loader'
project-name: 'aai-model-loader'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-model-loader-settings'
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index dede2a3..1e10466 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -8,6 +8,8 @@
- '{project-name}-{stream}-release-version-java-daily'
project: 'aai/rest-client'
stream:
+ - 'casablanca':
+ branch: 'casablanca'
- 'master':
branch: 'master'
mvn-settings: 'aai-rest-client-settings'
@@ -33,5 +35,5 @@
- gerrit-maven-clm
project: 'aai/rest-client'
project-name: 'aai-rest-client'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-rest-client-settings'
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index d6ffb1e..8abae8c 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -8,6 +8,8 @@
- '{project-name}-{stream}-release-version-java-daily'
project: 'aai/router-core'
stream:
+ - 'casablanca':
+ branch: 'casablanca'
- 'master':
branch: 'master'
mvn-settings: 'aai-router-core-settings'
@@ -33,5 +35,5 @@
- gerrit-maven-clm
project: 'aai/router-core'
project-name: 'aai-router-core'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-router-core-settings'
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index 602d1f2..d196704 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -11,6 +11,8 @@
mvn-goals: 'docker:build'
project: 'aai/search-data-service'
stream:
+ - 'casablanca':
+ branch: 'casablanca'
- 'master':
branch: 'master'
mvn-settings: 'aai-search-data-service-settings'
@@ -25,7 +27,7 @@
build-node: ubuntu1604-builder-4c-4g
project: 'aai/search-data-service'
project-name: 'aai-search-data-service'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-search-data-service-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -36,5 +38,5 @@
- gerrit-maven-clm
project: 'aai/search-data-service'
project-name: 'aai-search-data-service'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-search-data-service-settings'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index b07e17d..93dfd10 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -11,6 +11,8 @@
mvn-goals: 'docker:build'
project: 'aai/sparky-be'
stream:
+ - 'casablanca':
+ branch: 'casablanca'
- 'master':
branch: 'master'
mvn-settings: 'aai-sparky-be-settings'
@@ -25,7 +27,7 @@
build-node: ubuntu1604-builder-4c-4g
project: 'aai/sparky-be'
project-name: 'aai-sparky-be'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-sparky-be-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -36,5 +38,5 @@
- gerrit-maven-clm
project: 'aai/sparky-be'
project-name: 'aai-sparky-be'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-sparky-be-settings'
diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index 2595980..08106bd 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -9,6 +9,8 @@
- '{project-name}-{stream}-release-version-java-daily'
project: 'aai/sparky-fe'
stream:
+ - 'casablanca':
+ branch: 'casablanca'
- 'master':
branch: 'master'
mvn-settings: 'aai-sparky-fe-settings'
diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml
index 9f163da..00debc8 100644
--- a/jjb/aai/aai-spike.yaml
+++ b/jjb/aai/aai-spike.yaml
@@ -11,6 +11,8 @@
mvn-goals: 'docker:build'
project: 'aai/spike'
stream:
+ - 'casablanca':
+ branch: 'casablanca'
- 'master':
branch: 'master'
mvn-settings: 'aai-spike-settings'
@@ -26,7 +28,7 @@
build-node: ubuntu1604-builder-4c-4g
project: 'aai/spike'
project-name: 'aai-spike'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-spike-settings'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -36,5 +38,5 @@
- gerrit-maven-clm
project: 'aai/spike'
project-name: 'aai-spike'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-spike-settings'
diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml
index b3d14d7..522bf61 100644
--- a/jjb/aai/aai-validation.yaml
+++ b/jjb/aai/aai-validation.yaml
@@ -11,6 +11,8 @@
mvn-goals: 'docker:build'
project: 'aai/validation'
stream:
+ - 'casablanca':
+ branch: 'casablanca'
- 'master':
branch: 'master'
mvn-settings: 'aai-validation-settings'
@@ -26,7 +28,7 @@
build-node: ubuntu1604-builder-4c-4g
project: 'aai/validation'
project-name: 'aai-validation'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-validation-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -37,5 +39,5 @@
- gerrit-maven-clm
project: 'aai/validation'
project-name: 'aai-validation'
- branch: 'master'
+ branch: 'casablanca'
mvn-settings: 'aai-validation-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
index 821fa7e..128a50e 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml
@@ -7,8 +7,10 @@
stream:
- 'master':
branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
functionality:
- 'testsuites':
trigger_jobs:
- - 'dcaegen2-collectors-hv-ves-master-merge-java'
+ - '{project-name}-{stream}-merge-java'
robot-options: ''
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index b9caca7..7505223 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -6,6 +6,8 @@
stream:
- 'master':
branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
# apply to all jobs
project: 'dcaegen2/collectors/hv-ves'
mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index b0fe678..e49f832 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
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 0056c59..cc1fcb9 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
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-csit.yaml b/jjb/dcaegen2/dcaegen2-csit.yaml
index c68a9c1..6962c62 100644
--- a/jjb/dcaegen2/dcaegen2-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-csit.yaml
@@ -7,6 +7,8 @@
stream:
- 'master':
branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
functionality:
- 'testsuites'
trigger_jobs:
@@ -22,9 +24,11 @@
stream:
- 'master':
branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
functionality:
- 'prh-testsuites'
trigger_jobs:
- - 'dcaegen2-master-merge-java'
- - 'dcaegen2-services-prh-master-merge-java'
+ - 'dcaegen2-{stream}-merge-java'
+ - '{project-name}-{stream}-merge-java'
robot-options: ''
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index 648643e..23c4919 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
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 c76e65a..9b53ce8 100644
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
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-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 0bd986e..c22a311 100644
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
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 798fbc5..ae18461 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'
+ - 'casablanca':
+ branch: 'casablanca'
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 0c95824..938b4e8 100644
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
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 0076299..a041990 100644
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
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 024d41c..89609b4 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'
+ - 'casablanca':
+ branch: 'casablanca'
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 69d8c95..3dbefe4 100644
--- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
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-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index 9fdc9f9..e20fea6 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
mvn-settings: 'dcaegen2-services-prh-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 9b6cb64..cb2c08e 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -13,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
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/music/music-mdbc.yaml b/jjb/music/music-mdbc.yaml
new file mode 100644
index 0000000..ac358b9
--- /dev/null
+++ b/jjb/music/music-mdbc.yaml
@@ -0,0 +1,26 @@
+---
+- project:
+ name: music-mdbc
+ project-name: 'music-mdbc'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily'
+ project: 'music/mdbc'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'music-mdbc-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-builder-4c-4g
+
+
+- project:
+ name: music-mdbc-clm
+ jobs:
+ - gerrit-maven-clm
+ project: music/mdbc
+ project-name: 'music-mdbc'
+ branch: 'master'
+ mvn-settings: 'music-mdbc-settings'
diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index 43fe665..b5303c0 100644
--- a/jjb/music/music.yaml
+++ b/jjb/music/music.yaml
@@ -16,6 +16,8 @@
branch: 'master'
- 'beijing':
branch: 'beijing'
+ - 'dev-cassandra-only':
+ branch: 'dev-cassandra-only'
mvn-settings: 'music-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index 400509d..1b05ef0 100644
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -36,4 +36,5 @@
project: portal
project-name: 'portal'
branch: 'master'
+ build-node: ubuntu1604-builder-4c-4g
mvn-settings: 'portal-settings'