summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-11-08 12:20:48 -0800
committerJessica Wagantall <jwagantall@linuxfoundation.org>2018-11-08 12:22:59 -0800
commitab30bf6376847fd06f20e0b532f2a6f2d6baf2b3 (patch)
treeb4f73726df91890c5008fb3f2ae7ce58040690e9
parent7e0fdafb47b91a882d0482a86cd8edb1f6c48617 (diff)
Allow aai-docker to specify node
Allow {project-name}-{stream}-aai-docker-java-daily to allow a specific build-node to be able to run these jobs using the ARM architecture nodes. All current projects using this job will stay unchaged and will still run their builds on ubuntu1604-docker-8c-8g. Change-Id: Iba61122be8645f5b8cb500c5bd823ff17d2a3fcb Issue-ID: CIMAN-219 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
-rw-r--r--jjb/aaf/aaf-cadi.yaml3
-rw-r--r--jjb/aai/aai-babel.yaml1
-rw-r--r--jjb/aai/aai-chameleon.yaml1
-rw-r--r--jjb/aai/aai-champ.yaml1
-rw-r--r--jjb/aai/aai-data-router.yaml1
-rw-r--r--jjb/aai/aai-gizmo.yaml1
-rw-r--r--jjb/aai/aai-model-loader.yaml1
-rw-r--r--jjb/aai/aai-search-data-service.yaml1
-rw-r--r--jjb/aai/aai-sparky-be.yaml1
-rw-r--r--jjb/aai/aai-spike.yaml1
-rw-r--r--jjb/aai/aai-validation.yaml1
-rw-r--r--jjb/cli/cli.yaml1
-rw-r--r--jjb/global-templates-java.yaml2
-rw-r--r--jjb/vnfsdk/vnfsdk-refrepo.yaml1
14 files changed, 16 insertions, 1 deletions
diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index 0ef86c0c2..8fc0fee4c 100644
--- 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 832ed0dd4..436227221 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.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/babel'
stream:
- 'casablanca':
diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml
index f9f7b5c65..946a23cab 100644
--- a/jjb/aai/aai-chameleon.yaml
+++ b/jjb/aai/aai-chameleon.yaml
@@ -9,6 +9,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 0e4548f5d..46206810e 100644
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -9,6 +9,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 bab73108f..eb31740ce 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.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/data-router'
stream:
- 'casablanca':
diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml
index 498487548..31678e5ee 100644
--- a/jjb/aai/aai-gizmo.yaml
+++ b/jjb/aai/aai-gizmo.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/gizmo'
stream:
- 'casablanca':
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 70c42a5c4..8d54ac528 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.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/model-loader'
stream:
- 'casablanca':
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index d196704db..334b7f273 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.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/search-data-service'
stream:
- 'casablanca':
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 93dfd1051..16b7be28f 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -9,6 +9,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 00debc8f5..1714ff59d 100644
--- a/jjb/aai/aai-spike.yaml
+++ b/jjb/aai/aai-spike.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/spike'
stream:
- 'casablanca':
diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml
index 522bf6191..e19ecfe80 100644
--- 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 8522709bc..f0c61c88a 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -11,6 +11,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 61da2d5af..73dc62210 100644
--- 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 ceb5e2abc..0b3156c8f 100644
--- 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'