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

5 files changed, 11 insertions, 3 deletions

diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml
index 2fa450a70..5c4385bc6 100644
--- a/jjb/sdc/sdc-dcae-d-ci.yaml
+++ b/jjb/sdc/sdc-dcae-d-ci.yaml
@@ -13,6 +13,7 @@
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-docker-version-java-daily':
+         build-node: 'ubuntu1604-docker-8c-8g'
          docker-pom: 'pom.xml'
          mvn-profile: 'docker'
          mvn-params: '-DskipTests=true'
@@ -35,12 +36,12 @@
          docker-pom: 'pom.xml'
          mvn-profile: 'docker'
          mvn-params: '-DskipTests=true'
+         build-node: 'ubuntu1604-docker-arm64-4c-2g'
     project: 'sdc/dcae-d/ci'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'sdc-dcae-d-ci-settings'
-    build-node: ubuntu1604-docker-arm64-4c-2g
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
index de7b41d17..3630b4dde 100644
--- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
@@ -7,6 +7,7 @@
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-DskipTests=true'
@@ -26,6 +27,7 @@
     project-name: 'sdc-dcae-d-dt-be-main-arm64'
     jobs:
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-arm64-4c-2g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-DskipTests=true'
diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml
index 010b0c51a..6338c8c04 100644
--- a/jjb/sdc/sdc-dcae-d-dt.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt.yaml
@@ -8,6 +8,7 @@
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'server,docker'
           mvn-params: '-DskipTests=true'
@@ -28,6 +29,7 @@
     build-node: ubuntu1604-docker-arm64-4c-2g
     jobs:
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-arm64-4c-2g'
           docker-pom: 'pom.xml'
           mvn-profile: 'server,docker'
           mvn-params: '-DskipTests=true'
diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml
index 85cfbe5e4..9cc5de72c 100644
--- a/jjb/sdc/sdc-dcae-d-fe.yaml
+++ b/jjb/sdc/sdc-dcae-d-fe.yaml
@@ -8,6 +8,7 @@
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-DskipTests=true'
@@ -25,9 +26,9 @@
 - project:
     name: sdc-dcae-d-fe-arm64
     project-name: 'sdc-dcae-d-fe-arm64'
-    build-node: ubuntu1604-docker-arm64-4c-2g
     jobs:
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-arm64-4c-2g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-DskipTests=true'
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index a13e72996..7fe7985ac 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -36,6 +36,7 @@
       - '{project-name}-{stream}-release-version-java-daily':
           mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
@@ -56,10 +57,12 @@
     project-name: 'sdc-arm64'
     jobs:
       - '{project-name}-{stream}-sdc-merge-java':
+          build-node: 'ubuntu1604-docker-arm64-4c-2g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-arm64-4c-2g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
@@ -70,7 +73,6 @@
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
     maven-version: 'mvn35'
 
 - project: