Merge "Allow docker-java to specify node"

diff --combined jjb/aai/aai-esr-gui.yaml
index f236575,e8596d7..f109750
--- 1/jjb/aai/aai-esr-gui.yaml
--- 2/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@@ -1,10 -1,4 +1,10 @@@
  ---
 +- project:
 +    name: aai-esr-gui-project-view
 +    project-name: aai-esr-gui
 +    views:
 +      - project-view
 +
  - project:
      name: aai-esr-gui
      project-name: 'aai-esr-gui'
@@@ -14,7 -8,7 +14,7 @@@
        - '{project-name}-{stream}-release-version-java-daily'
        - '{project-name}-{stream}-docker-java-daily':
            mvn-params: '-Dmaven.test.skip=true'
- 
+           build-node: ubuntu1604-docker-8c-8g
      project: 'aai/esr-gui'
      stream:
        - 'master':

diff --combined jjb/aai/aai-esr-server.yaml
index f836341,9bed3ba..3dbf7a4
--- 1/jjb/aai/aai-esr-server.yaml
--- 2/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@@ -1,10 -1,4 +1,10 @@@
  ---
 +- project:
 +    name: aai-esr-server-project-view
 +    project-name: aai-esr-server
 +    views:
 +      - project-view
 +
  - project:
      name: aai-esr-server-master
      project-name: 'aai-esr-server'
@@@ -14,7 -8,7 +14,7 @@@
        - '{project-name}-{stream}-release-version-java-daily'
        - '{project-name}-{stream}-docker-java-daily':
            mvn-params: '-Dmaven.test.skip=true'
- 
+           build-node: ubuntu1604-docker-8c-8g
      project: 'aai/esr-server'
      stream:
        - 'master':

diff --combined jjb/aai/aai-graphadmin.yaml
index 37be8b3,3454ff4..f2b802f
--- 1/jjb/aai/aai-graphadmin.yaml
--- 2/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@@ -1,10 -1,4 +1,10 @@@
  ---
 +- project:
 +    name: aai-graphadmin-project-view
 +    project-name: aai-graphadmin
 +    views:
 +      - project-view
 +
  - project:
      name: aai-graphadmin-master
      project-name: 'aai-graphadmin'
@@@ -16,6 -10,7 +16,7 @@@
            docker-pom: 'pom.xml'
            mvn-profile: 'docker'
            mvn-params: '-Dmaven.test.skip=true'
+           build-node: ubuntu1604-docker-8c-8g
      project: 'aai/graphadmin'
      stream:
        - 'master':

diff --combined jjb/aai/aai-resources.yaml
index f19dc21,0daa0b1..cbd815e
--- 1/jjb/aai/aai-resources.yaml
--- 2/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@@ -1,10 -1,4 +1,10 @@@
  ---
 +- project:
 +    name: aai-resources-project-view
 +    project-name: aai-resources
 +    views:
 +      - project-view
 +
  - project:
      name: aai-resources
      project-name: 'aai-resources'
@@@ -16,6 -10,7 +16,7 @@@
            docker-pom: 'aai-resources/pom.xml'
            mvn-profile: 'docker'
            mvn-params: '-Dmaven.test.skip=true'
+           build-node: ubuntu1604-docker-8c-8g
      project: 'aai/resources'
      stream:
        - 'master':

diff --combined jjb/aai/aai-traversal.yaml
index 51d1711,dae6133..a53861d
--- 1/jjb/aai/aai-traversal.yaml
--- 2/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@@ -1,10 -1,4 +1,10 @@@
  ---
 +- project:
 +    name: aai-traversal-project-view
 +    project-name: aai-traversal
 +    views:
 +      - project-view
 +
  - project:
      name: aai-traversal-master
      project-name: 'aai-traversal'
@@@ -16,6 -10,7 +16,7 @@@
            docker-pom: 'aai-traversal/pom.xml'
            mvn-profile: 'docker'
            mvn-params: '-Dmaven.test.skip=true'
+           build-node: ubuntu1604-docker-8c-8g
      project: 'aai/traversal'
      stream:
        - 'master':

diff --combined jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
index 4eb9db8,2d378a1..0f824bf
--- 1/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
--- 2/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
@@@ -10,13 -10,11 +10,14 @@@
            docker-pom: 'pom.xml'
            mvn-profile: 'docker'
            mvn-params: '-Dmaven.test.skip=true'
+           build-node: ubuntu1604-docker-8c-8g
      project: logging-analytics/pomba/pomba-aai-context-builder
      stream:
        - 'master':
            branch: 'master'
 +      - 'casablanca':
 +          branch: 'casablanca'
 +
      mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
      files: '**'
      archive-artifacts: ''

diff --combined jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
index 2445b36,d36f5ce..9441448
--- 1/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
--- 2/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
@@@ -11,12 -11,11 +11,13 @@@
            mvn-goals: 'docker:build'
            mvn-profile: 'docker'
            mvn-params: '-Dmaven.test.skip=true'
+           build-node: ubuntu1604-docker-8c-8g
      project: logging-analytics/pomba/pomba-context-aggregator
      stream:
        - 'master':
            branch: 'master'
 +      - 'casablanca':
 +          branch: 'casablanca'
      mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings
      files: '**'
      archive-artifacts: ''

diff --combined jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
index b8bd935,d18990d..69e8d0d
--- 1/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
--- 2/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
@@@ -10,12 -10,11 +10,13 @@@
            docker-pom: 'pom.xml'
            mvn-profile: 'docker'
            mvn-params: '-Dmaven.test.skip=true'
+           build-node: ubuntu1604-docker-8c-8g
      project: logging-analytics/pomba/pomba-network-discovery-context-builder
      stream:
        - 'master':
            branch: 'master'
 +      - 'casablanca':
 +          branch: 'casablanca'
      mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
      files: '**'
      archive-artifacts: ''

diff --combined jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
index 131d415,37e0486..2be7358
--- 1/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
--- 2/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
@@@ -10,12 -10,11 +10,13 @@@
            docker-pom: 'pom.xml'
            mvn-profile: 'docker'
            mvn-params: '-Dmaven.test.skip=true'
+           build-node: ubuntu1604-docker-8c-8g
      project: logging-analytics/pomba/pomba-sdc-context-builder
      stream:
        - 'master':
            branch: 'master'
 +      - 'casablanca':
 +          branch: 'casablanca'
      mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
      files: '**'
      archive-artifacts: ''

diff --combined jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
index 499ec5b,099318c..49d7fea
--- 1/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
--- 2/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
@@@ -10,12 -10,11 +10,13 @@@
            docker-pom: 'pom.xml'
            mvn-profile: 'docker'
            mvn-params: '-Dmaven.test.skip=true'
+           build-node: ubuntu1604-docker-8c-8g
      project: logging-analytics/pomba/pomba-sdnc-context-builder
      stream:
        - 'master':
            branch: 'master'
 +      - 'casablanca':
 +          branch: 'casablanca'
      mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
      files: '**'
      archive-artifacts: ''

diff --combined jjb/sdc/sdc-sdc-workflow-designer.yaml
index 7da28b8,acb8e40..7fbf9f2
--- 1/jjb/sdc/sdc-sdc-workflow-designer.yaml
--- 2/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@@ -1,10 -1,4 +1,10 @@@
  ---
 +- project:
 +    name: sdc-sdc-workflow-project-view
 +    project-name: sdc-sdc-workflow
 +    views:
 +      - project-view
 +
  - project:
      name: sdc-sdc-workflow-designer
      project-name: 'sdc-sdc-workflow-designer'
@@@ -14,12 -8,11 +14,13 @@@
        - '{project-name}-{stream}-release-version-java-daily'
        - '{project-name}-{stream}-docker-java-daily':
            mvn-params: '-Dmaven.test.skip=true'
+           build-node: ubuntu1604-docker-8c-8g
      project: 'sdc/sdc-workflow-designer'
      stream:
        - 'master':
            branch: 'master'
 +      - 'casablanca':
 +          branch: 'casablanca'
      mvn-settings: 'sdc-sdc-workflow-designer-settings'
      files: '**'
      archive-artifacts: ''
@@@ -36,7 -29,7 +37,7 @@@
      build-node: ubuntu1604-builder-4c-4g
      project: 'sdc/sdc-workflow-designer'
      project-name: 'sdc-sdc-workflow-designer'
 -    branch: 'master'
 +    branch: 'casablanca'
      mvn-settings: 'sdc-sdc-workflow-designer-settings'
      mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}'
      mvn-goals: 'clean install'
@@@ -49,5 -42,5 +50,5 @@@
      project: sdc/sdc-workflow-designer
      project-name: 'sdc-sdc-workflow-designer'
      build-node: ubuntu1604-builder-4c-4g
 -    branch: 'master'
 +    branch: 'casablanca'
      mvn-settings: 'sdc-sdc-workflow-designer-settings'

diff --combined jjb/usecaseui/usecase-ui.yaml
index 9683067,83a99e4..01e0c84
--- 1/jjb/usecaseui/usecase-ui.yaml
--- 2/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@@ -1,9 -1,4 +1,9 @@@
  ---
 +- project:
 +    name: usecase-ui-project-view
 +    project-name: usecase-ui
 +    views:
 +      - project-view
  
  - project:
      name: usecase-ui
@@@ -19,6 -14,7 +19,7 @@@
        - '{project-name}-{stream}-release-version-java-daily'
        - '{project-name}-{stream}-docker-java-daily':
            mvn-params: '-Dmaven.test.skip=true'
+           build-node: ubuntu1604-docker-8c-8g
      files: '**'
      archive-artifacts: ''
      docker-pom: 'pom.xml'

diff --combined jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index c10b7c3,0e391df..7c75121
--- 1/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
--- 2/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@@ -1,10 -1,4 +1,10 @@@
  ---
 +- project:
 +    name: vnfsdk-project-view
 +    project-name: vnfsdk
 +    views:
 +      - project-view
 +
  - project:
      name: vnfsdk-dovetail-integration
      project-name: 'vnfsdk-dovetail-integration'
@@@ -31,7 -25,7 +31,7 @@@
            docker-pom: 'pom.xml'
            mvn-profile: 'docker'
            mvn-params: '-Dmaven.test.skip=true'
- 
+           build-node: ubuntu1604-docker-8c-8g
  - project:
      name: vnfsdk-dovetail-integration-tox-sonar
      jobs: