From fe5efea6652bb78c97e0afce3eadca59866646f1 Mon Sep 17 00:00:00 2001
From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Tue, 7 Aug 2018 16:02:39 -0700
Subject: Make build-node configurable

{project-name}-{stream}-docker-java-shell-daily job
needs to have the build-node parameter configurable.
This way, the projects will be able to select the
long live instance as build-node for their job.

For the rest of the projects using this template, the
build-node variable is set to the previous default
value.

Change-Id: Ie3722050870a04b0c2ca3108f6b526c7ac855def
Issue-ID: CIMAN-188
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
---
 jjb/aaf/aaf-authz.yaml                                    | 1 +
 jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml         | 1 +
 jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml | 1 +
 jjb/dcaegen2/dcaegen2-services-mapper.yaml                | 1 +
 jjb/dcaegen2/dcaegen2-services-prh.yaml                   | 1 +
 jjb/dmaap/dmaap-buscontroller.yaml                        | 1 +
 jjb/dmaap/dmaap-datarouter.yaml                           | 1 +
 jjb/global-templates-java.yaml                            | 2 +-
 8 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 960bf6bf2..e877b52dd 100644
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -12,6 +12,7 @@
           settings: '{mvn-settings}'
           script:
             !include-raw-escape: 'build-aaf-docker-image.sh'
+          build-node: 'ubuntu1604-docker-8c-8g'
     project: 'aaf/authz'
     stream:
       - 'master':
diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 65cba2b41..8ac744a79 100644
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -11,6 +11,7 @@
           mvn-goals: 'clean package docker:build -DpushImage'
           # No-op
           script: '/bin/true'
+          build-node: 'ubuntu1604-docker-8c-8g'
 
     project: 'dcaegen2/platform/inventory-api'
     stream:
diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
index 33fcb1151..7c66bfdc8 100644
--- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
@@ -11,6 +11,7 @@
           mvn-goals: 'clean package docker:build -DpushImage'
           # No-op
           script: '/bin/true'
+          build-node: 'ubuntu1604-docker-8c-8g'
 
     project: 'dcaegen2/platform/servicechange-handler'
     stream:
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index aed61875c..322c07973 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -11,6 +11,7 @@
           mvn-goals: 'clean package docker:build -DpushImage'
           # No-op
           script: '/bin/true'
+          build-node: 'ubuntu1604-docker-8c-8g'
     project: 'dcaegen2/services/mapper'
     stream:
       - 'master':
diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index ad1fa4ac2..b555fd87d 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -11,6 +11,7 @@
           mvn-goals: 'clean package docker:build -DpushImage'
           # No-op
           script: '/bin/true'
+          build-node: 'ubuntu1604-docker-8c-8g'
 
     project: 'dcaegen2/services/prh'
     stream:
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 89e635e94..2af0e8d96 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -16,6 +16,7 @@
           mvn-goals: 'clean package -P docker docker:build -DpushImage'
           # No-op
           script: '/bin/true'
+          build-node: 'ubuntu1604-docker-8c-8g'
 
     project: 'dmaap/buscontroller'
     stream:
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index c61122c20..da0088dea 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -14,6 +14,7 @@
           mvn-goals: 'clean package -P docker docker:build -DpushImage'
           # No-op
           script: '/bin/true'
+          build-node: 'ubuntu1604-docker-8c-8g'
 
     project: 'dmaap/datarouter'
     stream:
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 29a5c290f..d2bd47490 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -925,7 +925,7 @@
 
     name: '{project-name}-{stream}-docker-java-shell-daily'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: '{build-node}'
     disabled: '{disabled}'
     properties:
       - infra-properties:
-- 
cgit 1.2.3-korg