Merge "Allow docker-version-java to specify node"

diff --combined jjb/externalapi/externalapi-nbi.yaml
index cd4fadb,a7c5788..bdd1541
--- 1/jjb/externalapi/externalapi-nbi.yaml
--- 2/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@@ -16,12 -16,13 +16,13 @@@
            docker-pom: 'pom.xml'
            mvn-profile: 'docker'
            mvn-params: '-Dmaven.test.skip=true'
+           build-node: 'ubuntu1604-docker-8c-8g'
      project: 'externalapi/nbi'
      stream:
        - 'master':
            branch: 'master'
 -      - 'beijing':
 -          branch: 'beijing'
 +      - 'casablanca':
 +          branch: 'casablanca'
      mvn-settings: 'externalapi-nbi-settings'
      files: '**'
      archive-artifacts: ''
@@@ -35,6 -36,7 +36,7 @@@
            docker-pom: 'pom.xml'
            mvn-profile: 'docker'
            mvn-params: '-Dmaven.test.skip=true'
+           build-node: 'ubuntu1604-docker-arm64-4c-2g'
      project: 'externalapi/nbi'
      stream:
        - 'master':
@@@ -42,7 -44,6 +44,6 @@@
      mvn-settings: 'externalapi-nbi-settings'
      files: '**'
      archive-artifacts: ''
-     build-node: ubuntu1604-docker-arm64-4c-2g
  
  - project:
      name: externalapi-nbi-clm
@@@ -51,11 -52,7 +52,11 @@@
      nexus-iq-namespace: 'onap-'
      project: 'externalapi/nbi'
      project-name: 'externalapi-nbi'
 -    branch: 'master'
 +    stream:
 +      - 'master':
 +          branch: 'master'
 +      - 'casablanca':
 +          branch: 'casablanca'
      mvn-settings: 'externalapi-nbi-settings'
  
  - project:
@@@ -66,7 -63,7 +67,7 @@@
      build-node: ubuntu1604-builder-4c-4g
      project: 'externalapi/nbi'
      project-name: 'externalapi-nbi'
 -    branch: 'master'
 +    branch: 'casablanca'
      mvn-settings: 'externalapi-nbi-settings'
      mvn-goals: 'clean install'
 -    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 +    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --combined jjb/logging-analytics/logging-analytics.yaml
index 685c69a,54b1eb4..dcbd07a
--- 1/jjb/logging-analytics/logging-analytics.yaml
--- 2/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@@ -16,6 -16,7 +16,7 @@@
            docker-pom: 'pom.xml'
            mvn-profile: 'docker'
            mvn-params: '-Dmaven.test.skip=true'
+           build-node: 'ubuntu1604-docker-8c-8g'
      project: 'logging-analytics'
      stream:
        - 'master':
@@@ -27,25 -28,6 +28,25 @@@
      archive-artifacts: ''
      build-node: ubuntu1604-builder-4c-4g
  
 +- project:
 +    name: logging-analytics-arm64
 +    project-name: 'logging-analytics-arm64'
 +    jobs:
 +      - '{project-name}-{stream}-docker-version-java-daily':
 +          docker-pom: 'pom.xml'
 +          mvn-profile: 'docker'
 +          mvn-params: '-Dmaven.test.skip=true'
 +    project: 'logging-analytics'
 +    stream:
 +      - 'master':
 +          branch: 'master'
 +      - 'casablanca':
 +          branch: 'casablanca'
 +    mvn-settings: 'logging-analytics-settings'
 +    files: '**'
 +    archive-artifacts: ''
 +    build-node: ubuntu1604-docker-arm64-4c-2g
 +
  - project:
      name: logging-analytics-sonar
      jobs:

diff --combined jjb/vnfsdk/vnfsdk-ice-python.yaml
index 62ebe6e,2307ac7..a845ee1
--- 1/jjb/vnfsdk/vnfsdk-ice-python.yaml
--- 2/jjb/vnfsdk/vnfsdk-ice-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml
@@@ -50,29 -50,8 +50,30 @@@
            docker-pom: 'docker/pom.xml'
            mvn-profile: 'docker'
            mvn-params: '-Dmaven.test.skip=true'
+           build-node: 'ubuntu1604-docker-8c-8g'
  
 +- project:
 +    name: vnfsdk-ice-docker-arm64
 +    project-name: 'vnfsdk-ice-docker-arm64'
 +    project: 'vnfsdk/ice'
 +    pom: 'pom.xml'
 +    stream:
 +      - 'master':
 +          branch: 'master'
 +    subproject:
 +      - 'docker':
 +          path: 'docker'
 +          pattern: 'docker/**'
 +          pom: 'docker/pom.xml'
 +    mvn-settings: 'vnfsdk-ice-settings'
 +    build-node: ubuntu1604-docker-arm64-4c-2g
 +    jobs:
 +      - '{project-name}-{stream}-{subproject}-merge-java'
 +      - '{project-name}-{stream}-docker-version-java-daily':
 +          docker-pom: 'docker/pom.xml'
 +          mvn-profile: 'docker'
 +          mvn-params: '-Dmaven.test.skip=true'
 +
  - project:
      name: vnfsdk-ice-validation-scripts-tox-sonar
      jobs:

diff --combined jjb/vnfsdk/vnfsdk-refrepo.yaml
index 7e1e567,34e6e3b..c1d2c6c
--- 1/jjb/vnfsdk/vnfsdk-refrepo.yaml
--- 2/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@@ -15,6 -15,7 +15,7 @@@
            docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
            mvn-profile: 'docker'
            mvn-params: '-Dmaven.test.skip=true'
+           build-node: ubuntu1604-docker-8c-8g
      project: 'vnfsdk/refrepo'
      stream:
        - 'master':
@@@ -24,27 -25,6 +25,27 @@@
      archive-artifacts: ''
      build-node: ubuntu1604-builder-4c-4g
  
 +- project:
 +    name: vnfsdk-refrepo-arm64
 +    project-name: 'vnfsdk-refrepo-arm64'
 +    jobs:
 +      - '{project-name}-{stream}-aai-docker-java-daily':
 +          pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml'
 +          mvn-goals: 'docker:build'
 +          docker-image-name: 'onap/vnfsdk/refrepo'
 +      - '{project-name}-{stream}-docker-version-java-daily':
 +          docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
 +          mvn-profile: 'docker'
 +          mvn-params: '-Dmaven.test.skip=true'
 +    project: 'vnfsdk/refrepo'
 +    stream:
 +      - 'master':
 +          branch: 'master'
 +    mvn-settings: 'vnfsdk-refrepo-settings'
 +    files: '**'
 +    archive-artifacts: ''
 +    build-node: ubuntu1604-docker-arm64-4c-2g
 +
  - project:
      name: vnfsdk-refrepo-sonar
      jobs: