summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2019-02-05 09:35:02 -0800
committerJessica Wagantall <jwagantall@linuxfoundation.org>2019-02-05 09:35:02 -0800
commit8ff247ef9cdb773b5ac4ec68accc8210f8fd85ce (patch)
tree2c6cd39d4b13ca2ce4f667eeefb61f9be1945706
parent3e55bbdc482bfbca060bc9fbecbfe4b8e6c020ea (diff)
Fix SDC merge jobs.
Use correct docker node to run sdc-merge-java. The build node is a parameter that was not provided. Change-Id: I71ee1573bbd8b95ef59b1b77eca0aee901095f36 Issue-ID: CIMAN-34 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
-rw-r--r--jjb/sdc/sdc-sdc-docker-base.yaml2
-rw-r--r--jjb/sdc/sdc.yaml1
2 files changed, 3 insertions, 0 deletions
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index 3560a5f85..c372f8ab4 100644
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -5,6 +5,7 @@
project-name: 'sdc-sdc-docker-base'
jobs:
- '{project-name}-{stream}-sdc-merge-java':
+ build-node: 'ubuntu1604-docker-8c-8g'
docker-pom: 'pom.xml'
mvn-profile: 'default'
project: 'sdc/sdc-docker-base'
@@ -24,6 +25,7 @@
project-name: 'sdc-sdc-docker-base-arm64'
jobs:
- '{project-name}-{stream}-sdc-merge-java':
+ build-node: 'ubuntu1604-docker-8c-8g'
docker-pom: 'pom.xml'
mvn-profile: 'default'
project: 'sdc/sdc-docker-base'
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index cfdaad2f5..f3d3f68d3 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -30,6 +30,7 @@
- '{project-name}-{stream}-verify-java':
mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
- '{project-name}-{stream}-sdc-merge-java':
+ build-node: 'ubuntu1604-docker-8c-8g'
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'