Merge "Allow aai-docker to specify node"

diff --combined jjb/aai/aai-babel.yaml
index a334610,4362272..8da02eb
--- 1/jjb/aai/aai-babel.yaml
--- 2/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@@ -1,10 -1,4 +1,10 @@@
  ---
 +- project:
 +    name: aai-babel-project-view
 +    project-name: aai-babel
 +    views:
 +      - project-view
 +
  - project:
      name: aai-babel
      project-name: 'aai-babel'
@@@ -15,6 -9,7 +15,7 @@@
        - '{project-name}-{stream}-aai-docker-java-daily':
            pom: 'pom.xml'
            mvn-goals: 'docker:build'
+           build-node: ubuntu1604-docker-8c-8g
      project: 'aai/babel'
      stream:
        - 'casablanca':

diff --combined jjb/aai/aai-chameleon.yaml
index 2ec59d1,946a23c..ff9a8fd
--- 1/jjb/aai/aai-chameleon.yaml
--- 2/jjb/aai/aai-chameleon.yaml
+++ b/jjb/aai/aai-chameleon.yaml
@@@ -1,10 -1,4 +1,10 @@@
  ---
 +- project:
 +    name: aai-chameleon-project-view
 +    project-name: aai-chameleon
 +    views:
 +      - project-view
 +
  - project:
      name: aai-chameleon
      project-name: 'aai-chameleon'
@@@ -15,6 -9,7 +15,7 @@@
        - '{project-name}-{stream}-aai-docker-java-daily':
            pom: 'pom.xml'
            mvn-goals: 'clean package dockerfile:build dockerfile:push'
+           build-node: ubuntu1604-docker-8c-8g
      project: 'aai/chameleon'
      stream:
        - 'casablanca':

diff --combined jjb/aai/aai-champ.yaml
index 217e9f8,4620681..dc50ae8
--- 1/jjb/aai/aai-champ.yaml
--- 2/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@@ -1,10 -1,4 +1,10 @@@
  ---
 +- project:
 +    name: aai-champ-project-view
 +    project-name: aai-champ
 +    views:
 +      - project-view
 +
  - project:
      name: aai-champ
      project-name: 'aai-champ'
@@@ -15,12 -9,11 +15,13 @@@
        - '{project-name}-{stream}-aai-docker-java-daily':
            pom: 'champ-service/pom.xml'
            mvn-goals: 'docker:build'
+           build-node: ubuntu1604-docker-8c-8g
      project: 'aai/champ'
      stream:
        - 'master':
            branch: 'master'
 +      - 'casablanca':
 +          branch: 'casablanca'
      mvn-settings: 'aai-champ-settings'
      files: '**'
      archive-artifacts: ''
@@@ -34,7 -27,7 +35,7 @@@
      build-node: ubuntu1604-builder-4c-4g
      project: 'aai/champ'
      project-name: 'aai-champ'
 -    branch: 'master'
 +    branch: 'casablanca'
      mvn-settings: 'aai-champ-settings'
      mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@@ -45,5 -38,5 +46,5 @@@
        - gerrit-maven-clm
      project: 'aai/champ'
      project-name: 'aai-champ'
 -    branch: 'master'
 +    branch: 'casablanca'
      mvn-settings: 'aai-champ-settings'

diff --combined jjb/aai/aai-data-router.yaml
index 31901d9,eb31740..39da6d5
--- 1/jjb/aai/aai-data-router.yaml
--- 2/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@@ -1,10 -1,4 +1,10 @@@
  ---
 +- project:
 +    name: aai-data-router-project-view
 +    project-name: aai-data-router
 +    views:
 +      - project-view
 +
  - project:
      name: aai-data-router-master
      project-name: 'aai-data-router'
@@@ -15,6 -9,7 +15,7 @@@
        - '{project-name}-{stream}-aai-docker-java-daily':
            pom: 'pom.xml'
            mvn-goals: 'docker:build'
+           build-node: ubuntu1604-docker-8c-8g
      project: 'aai/data-router'
      stream:
        - 'casablanca':

diff --combined jjb/aai/aai-gizmo.yaml
index 83dec55,31678e5..0e7ac54
--- 1/jjb/aai/aai-gizmo.yaml
--- 2/jjb/aai/aai-gizmo.yaml
+++ b/jjb/aai/aai-gizmo.yaml
@@@ -1,10 -1,4 +1,10 @@@
  ---
 +- project:
 +    name: aai-gizmo-project-view
 +    project-name: aai-gizmo
 +    views:
 +      - project-view
 +
  - project:
      name: aai-gizmo
      project-name: 'aai-gizmo'
@@@ -15,6 -9,7 +15,7 @@@
        - '{project-name}-{stream}-aai-docker-java-daily':
            pom: 'pom.xml'
            mvn-goals: 'docker:build'
+           build-node: ubuntu1604-docker-8c-8g
      project: 'aai/gizmo'
      stream:
        - 'casablanca':

diff --combined jjb/aai/aai-model-loader.yaml
index b053274,8d54ac5..28bf078
--- 1/jjb/aai/aai-model-loader.yaml
--- 2/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@@ -1,10 -1,4 +1,10 @@@
  ---
 +- project:
 +    name: aai-model-loader-project-view
 +    project-name: aai-model-loader
 +    views:
 +      - project-view
 +
  - project:
      name: aai-model-loader-master
      project-name: 'aai-model-loader'
@@@ -15,6 -9,7 +15,7 @@@
        - '{project-name}-{stream}-aai-docker-java-daily':
            pom: 'pom.xml'
            mvn-goals: 'docker:build'
+           build-node: ubuntu1604-docker-8c-8g
      project: 'aai/model-loader'
      stream:
        - 'casablanca':

diff --combined jjb/aai/aai-search-data-service.yaml
index 80c631d,334b7f2..6be8369
--- 1/jjb/aai/aai-search-data-service.yaml
--- 2/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@@ -1,10 -1,4 +1,10 @@@
  ---
 +- project:
 +    name: aai-search-data-service-project-view
 +    project-name: aai-search-data-service
 +    views:
 +      - project-view
 +
  - project:
      name: aai-search-data-service-master
      project-name: 'aai-search-data-service'
@@@ -15,6 -9,7 +15,7 @@@
        - '{project-name}-{stream}-aai-docker-java-daily':
            pom: 'pom.xml'
            mvn-goals: 'docker:build'
+           build-node: ubuntu1604-docker-8c-8g
      project: 'aai/search-data-service'
      stream:
        - 'casablanca':

diff --combined jjb/aai/aai-sparky-be.yaml
index d392595,16b7be2..ad2a21e
--- 1/jjb/aai/aai-sparky-be.yaml
--- 2/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@@ -1,10 -1,4 +1,10 @@@
  ---
 +- project:
 +    name: aai-sparky-project-view
 +    project-name: aai-sparky
 +    views:
 +      - project-view
 +
  - project:
      name: aai-sparky-be-master
      project-name: 'aai-sparky-be'
@@@ -15,6 -9,7 +15,7 @@@
        - '{project-name}-{stream}-aai-docker-java-daily':
            pom: 'sparkybe-onap-application/pom.xml'
            mvn-goals: 'docker:build'
+           build-node: ubuntu1604-docker-8c-8g
      project: 'aai/sparky-be'
      stream:
        - 'casablanca':

diff --combined jjb/aai/aai-spike.yaml
index 84743b2,1714ff5..7803f7c
--- 1/jjb/aai/aai-spike.yaml
--- 2/jjb/aai/aai-spike.yaml
+++ b/jjb/aai/aai-spike.yaml
@@@ -1,10 -1,4 +1,10 @@@
  ---
 +- project:
 +    name: aai-spike-project-view
 +    project-name: aai-spike
 +    views:
 +      - project-view
 +
  - project:
      name: aai-spike
      project-name: 'aai-spike'
@@@ -15,6 -9,7 +15,7 @@@
        - '{project-name}-{stream}-aai-docker-java-daily':
            pom: 'pom.xml'
            mvn-goals: 'docker:build'
+           build-node: ubuntu1604-docker-8c-8g
      project: 'aai/spike'
      stream:
        - 'casablanca':

diff --combined jjb/cli/cli.yaml
index b9cf480,f0c61c8..32aa728
--- 1/jjb/cli/cli.yaml
--- 2/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@@ -1,9 -1,4 +1,9 @@@
  ---
 +- project:
 +    name: cli-project-view
 +    project-name: cli
 +    views:
 +      - project-view
  
  - project:
      name: cli
@@@ -16,6 -11,7 +16,7 @@@
            pom: 'deployment/docker/pom.xml'
            mvn-goals: 'docker:build'
            docker-image-name: 'onap/cli'
+           build-node: ubuntu1604-docker-8c-8g
  
      project: 'cli'
      stream: