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

13 files changed, 20 insertions, 5 deletions

diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index cd4fadb4c..bdd15418d 100644
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -16,6 +16,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
+          build-node: 'ubuntu1604-docker-8c-8g'
     project: 'externalapi/nbi'
     stream:
       - 'master':
@@ -35,6 +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 @@
     mvn-settings: 'externalapi-nbi-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
 
 - project:
     name: externalapi-nbi-clm
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index f352030ae..2951d351d 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1154,7 +1154,7 @@
     name: '{project-name}-{stream}-docker-version-java-daily'
     id: '{project-name}-{stream}-docker-version-java-daily'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: '{build-node}'
     disabled: '{disabled}'
     properties:
       - infra-properties:
diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 685c69a11..dcbd07a54 100644
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -16,6 +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':
diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml
index fc3ae6e1a..a86189221 100644
--- a/jjb/music/music-prom.yaml
+++ b/jjb/music/music-prom.yaml
@@ -10,6 +10,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: docker
           mvn-params: '-Dmaven.test.skip=true'
+          build-node: 'ubuntu1604-docker-8c-8g'
     project: 'music/prom'
     stream:
       - 'master':
diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index d6130caf8..698799662 100644
--- a/jjb/music/music.yaml
+++ b/jjb/music/music.yaml
@@ -16,6 +16,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: docker
           mvn-params: '-Dmaven.test.skip=true'
+          build-node: 'ubuntu1604-docker-8c-8g'
     project: 'music'
     stream:
       - 'master':
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:
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index a3b389abc..5d474e315 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -13,6 +13,7 @@
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml
index 62ebe6eea..a845ee113 100644
--- a/jjb/vnfsdk/vnfsdk-ice-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml
@@ -50,6 +50,7 @@
           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
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 7e1e567ca..c1d2c6c3d 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -15,6 +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':