summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-11-08 13:03:33 -0800
committerJessica Wagantall <jwagantall@linuxfoundation.org>2018-11-27 12:21:48 -0800
commitd50aa197273571479f6d4e30c07dbb59a2b6def4 (patch)
tree746d74492e6991e50124d40c18fd73acc7e3e2d2
parentadd2c4726724cc6b7fa01e149c8c6e6594d9eee2 (diff)
Allow docker-java to specify node
Allow {project-name}-{stream}-docker-java-version-shell-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: Iba2032d80038d5b4d4ef3a73900c89866a896918 Issue-ID: CIMAN-219 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
-rw-r--r--jjb/global-templates-java.yaml2
-rw-r--r--jjb/msb/msb-apigateway.yaml2
-rw-r--r--jjb/msb/msb-discovery.yaml1
-rw-r--r--jjb/multicloud/multicloud-azure-java.yaml1
-rw-r--r--jjb/multicloud/multicloud-framework-java.yaml1
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-java.yaml1
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml1
-rw-r--r--jjb/multicloud/multicloud-openstack.yaml1
-rw-r--r--jjb/oom/oom-registrator.yaml1
-rw-r--r--jjb/policy/policy-apex-pdp.yaml4
-rw-r--r--jjb/policy/policy-drools-pdp.yaml4
-rw-r--r--jjb/policy/policy-engine.yaml4
-rw-r--r--jjb/vfc/vfc-gvnfm-vnflcm-java.yaml1
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml1
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfres-java.yaml1
-rw-r--r--jjb/vfc/vfc-nfvo-catalog.yaml1
-rw-r--r--jjb/vfc/vfc-nfvo-db.yaml1
-rw-r--r--jjb/vfc/vfc-nfvo-driver-ems-java.yaml1
-rw-r--r--jjb/vfc/vfc-nfvo-driver-sfc.yaml1
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml1
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml1
-rw-r--r--jjb/vfc/vfc-nfvo-lcm-java.yaml1
-rw-r--r--jjb/vfc/vfc-nfvo-multivimproxy.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-resmanagement.yaml2
24 files changed, 27 insertions, 10 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 83555d2cb..f352030ae 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -997,7 +997,7 @@
name: '{project-name}-{stream}-docker-java-version-shell-daily'
project-type: freestyle
- node: 'ubuntu1604-docker-8c-8g'
+ node: '{build-node}'
disabled: '{disabled}'
properties:
- infra-properties:
diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index a99a484db..4af746a33 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -17,7 +17,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-apigateway-docker-image.sh'
-
+ build-node: ubuntu1604-docker-8c-8g
project: 'msb/apigateway'
stream:
- 'master':
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index 3ffdc229e..0f3cdf542 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -11,6 +11,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-discovery-docker-image.sh'
+ build-node: ubuntu1604-docker-8c-8g
project: 'msb/discovery'
stream:
- 'master':
diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
index b4590be97..571b741df 100644
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -22,6 +22,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-multicloud-azure-docker-image.sh'
+ build-node: ubuntu1604-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 8da6ac993..e2f95f0f2 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -22,6 +22,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-multicloud-framework-docker-image.sh'
+ build-node: ubuntu1604-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 0743a2425..38b3bd0a5 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -22,6 +22,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh'
+ build-node: ubuntu1604-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
index 2bcb2e870..e3b969cdf 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
@@ -20,6 +20,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh'
+ build-node: ubuntu1604-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index f82e09d20..f47010ace 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -52,6 +52,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
+ build-node: ubuntu1604-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: 'ubuntu1604-memcached-4c-4g'
diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml
index 060ffb731..0fb0dff47 100644
--- a/jjb/oom/oom-registrator.yaml
+++ b/jjb/oom/oom-registrator.yaml
@@ -11,6 +11,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-registrator-docker-image.sh'
+ build-node: ubuntu1604-docker-8c-8g
project: 'oom/registrator'
stream:
- 'master':
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index dd3551582..43e7cde19 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -22,7 +22,7 @@
script:
!include-raw-escape: 'include-raw-docker-release.sh'
disabled: true
-
+ build-node: ubuntu1604-docker-8c-8g
project: 'policy/apex-pdp'
stream:
- 'master':
@@ -49,7 +49,7 @@
script:
!include-raw-escape: 'include-raw-docker-release.sh'
disabled: true
-
+ build-node: ubuntu1604-docker-8c-8g
project: 'policy/apex-pdp'
stream:
- 'casablanca':
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 1ff637832..e00d9c049 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -16,7 +16,7 @@
script:
!include-raw-escape: 'include-raw-docker-release.sh'
disabled: true
-
+ build-node: ubuntu1604-docker-8c-8g
project: 'policy/drools-pdp'
stream:
- 'master':
@@ -43,7 +43,7 @@
script:
!include-raw-escape: 'include-raw-docker-release.sh'
disabled: true
-
+ build-node: ubuntu1604-docker-8c-8g
project: 'policy/drools-pdp'
stream:
- 'casablanca':
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index ec538d43a..d7a3f3132 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -16,7 +16,7 @@
script:
!include-raw-escape: 'include-raw-docker-release.sh'
disabled: true
-
+ build-node: ubuntu1604-docker-8c-8g
project: 'policy/engine'
stream:
- 'master':
@@ -43,7 +43,7 @@
script:
!include-raw-escape: 'include-raw-docker-release.sh'
disabled: true
-
+ build-node: ubuntu1604-docker-8c-8g
project: 'policy/engine'
stream:
- 'casablanca':
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index a2aa255c2..d84279562 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -26,6 +26,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh'
+ build-node: ubuntu1604-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: centos7-redis-4c-4g
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index f08054a15..9c21516a0 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -20,6 +20,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh'
+ build-node: ubuntu1604-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 82d31fc75..1ce26650e 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -21,6 +21,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh'
+ build-node: ubuntu1604-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index 3587f4005..a3dabf693 100644
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -22,6 +22,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-nfvo-catalog-docker-image.sh'
+ build-node: ubuntu1604-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: centos7-redis-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml
index 8a4cf5e4c..257504d1e 100644
--- a/jjb/vfc/vfc-nfvo-db.yaml
+++ b/jjb/vfc/vfc-nfvo-db.yaml
@@ -17,3 +17,4 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-nfvo-db-docker-image.sh'
+ build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index 70bd630e0..8ecab5df2 100644
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -21,6 +21,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-driver-ems-docker-image.sh'
+ build-node: ubuntu1604-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index f754a2c1b..e9befbf85 100644
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -20,6 +20,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-driver-zte-sfc-docker-image.sh'
+ build-node: ubuntu1604-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 456e38123..70fd1abe3 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -21,6 +21,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-gvnfm-driver-docker-image.sh'
+ build-node: ubuntu1604-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
index 617007e2b..09d0ce061 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
@@ -14,6 +14,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-nfvo-svnfm-driver-docker-image.sh'
+ build-node: ubuntu1604-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index 25d0f053a..81a403e4c 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -16,6 +16,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-nfvo-lcm-docker-image.sh'
+ build-node: ubuntu1604-docker-8c-8g
files: '**'
archive-artifacts: ''
build-node: centos7-redis-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
index 4ca4852fa..0094fb8a2 100644
--- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml
+++ b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
@@ -17,7 +17,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-nfvo-multivimproxy-docker-image.sh'
-
+ build-node: ubuntu1604-docker-8c-8g
- project:
name: vfc-nfvo-multivimproxy-sonar
jobs:
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index ba51b7dc2..33b0a672e 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -17,7 +17,7 @@
mvn-goals: 'install'
script:
!include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh'
-
+ build-node: ubuntu1604-docker-8c-8g
- project:
name: vfc-nfvo-resmanagement-sonar
jobs: