Merge "Allow aai-docker to specify node"

diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index 0ef86c0..8fc0fee 100644 (file)
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -35,6 +35,7 @@
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'sidecar/fproxy/pom.xml'
           mvn-goals: 'docker:build'
+          build-node: ubuntu1604-docker-8c-8g
     project: 'aaf/cadi'
     docker-image-name: 'onap/fproxy'
     stream:
@@ -65,6 +66,7 @@
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'sidecar/rproxy/pom.xml'
           mvn-goals: 'docker:build'
+          build-node: ubuntu1604-docker-8c-8g
     project: 'aaf/cadi'
     docker-image-name: 'onap/rproxy'
     stream:
@@ -95,6 +97,7 @@
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'sidecar/tproxy-config/pom.xml'
           mvn-goals: 'docker:build'
+          build-node: ubuntu1604-docker-8c-8g
     project: 'aaf/cadi'
     docker-image-name: 'onap/tproxy-config'
     stream:

diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index a334610..8da02eb 100644 (file)
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -15,6 +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 --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml
index 2ec59d1..ff9a8fd 100644 (file)
--- a/jjb/aai/aai-chameleon.yaml
+++ b/jjb/aai/aai-chameleon.yaml
@@ -15,6 +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 --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index 217e9f8..dc50ae8 100644 (file)
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -15,6 +15,7 @@
       - '{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':

diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index 31901d9..39da6d5 100644 (file)
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -15,6 +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 --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml
index 83dec55..0e7ac54 100644 (file)
--- a/jjb/aai/aai-gizmo.yaml
+++ b/jjb/aai/aai-gizmo.yaml
@@ -15,6 +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 --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index b053274..28bf078 100644 (file)
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -15,6 +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 --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index 80c631d..6be8369 100644 (file)
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -15,6 +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 --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index d392595..ad2a21e 100644 (file)
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -15,6 +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 --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml
index 84743b2..7803f7c 100644 (file)
--- a/jjb/aai/aai-spike.yaml
+++ b/jjb/aai/aai-spike.yaml
@@ -15,6 +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 --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml
index 522bf61..e19ecfe 100644 (file)
--- a/jjb/aai/aai-validation.yaml
+++ b/jjb/aai/aai-validation.yaml
@@ -9,6 +9,7 @@
       - '{project-name}-{stream}-aai-docker-java-daily':
           pom: 'pom.xml'
           mvn-goals: 'docker:build'
+          build-node: ubuntu1604-docker-8c-8g
     project: 'aai/validation'
     stream:
       - 'casablanca':

diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index b9cf480..32aa728 100644 (file)
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -16,6 +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:

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 61da2d5..73dc622 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1251,7 +1251,7 @@
 
     name: '{project-name}-{stream}-aai-docker-java-daily'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: '{build-node}'
     docker-image-name: ''
     disabled: '{disabled}'
     properties:

diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index ceb5e2a..0b3156c 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -10,6 +10,7 @@
           pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml'
           mvn-goals: 'docker:build'
           docker-image-name: 'onap/vnfsdk/refrepo'
+          build-node: ubuntu1604-docker-8c-8g
       - '{project-name}-{stream}-docker-version-java-daily':
           docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
           mvn-profile: 'docker'