summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Donley <christopher.donley@huawei.com>2018-04-20 13:22:03 -0700
committerChris Donley <christopher.donley@huawei.com>2018-04-20 13:33:56 -0700
commit39b528c2b706a91d79f35b8a1c65852a5f4556a8 (patch)
tree8bfdb09bb0ba40363b2d9e8020e684f5f5381035
parent554b9f03099816e32f17f2ab05f952f9a1349ddc (diff)
fix vnfsdk/ice jjb
Clean up docker treatment to fix vnfsdk-ice-*-staging-master jobs Issue-ID: VNFSDK-259 Change-Id: Id538f4271da3f1cca68a5c88a721af646c63b3f7 Signed-off-by: Chris Donley <christopher.donley@huawei.com>
-rw-r--r--jjb/vnfsdk/vnfsdk-ice-python.yaml21
1 files changed, 16 insertions, 5 deletions
diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml
index ee5b5adf8..c4a125493 100644
--- a/jjb/vnfsdk/vnfsdk-ice-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml
@@ -21,19 +21,30 @@
pom: 'ice-server/pom.xml'
tox-dir: 'ice-server/'
tox-envs: ''
+ mvn-settings: 'vnfsdk-ice-settings'
+ build-node: ubuntu1604-builder-4c-4g
+ jobs:
+ - gerrit-maven-clm
+ - '{project-name}-{stream}-{subproject}-verify-python'
+ - '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{subproject}-python-staging-{stream}'
+- project:
+ name: vnfsdk-ice-docker
+ project-name: 'vnfsdk-ice-docker'
+ project: 'vnfsdk/ice'
+ pom: 'pom.xml'
+ stream:
+ - 'master':
+ branch: 'master'
+ subproject:
- 'docker':
path: 'docker'
pattern: 'docker/**'
pom: 'docker/pom.xml'
- tox-dir: 'ice-server/'
- tox-envs: ''
mvn-settings: 'vnfsdk-ice-settings'
build-node: ubuntu1604-builder-4c-4g
jobs:
- - gerrit-maven-clm
- - '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{subproject}-python-staging-{stream}'
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'docker/pom.xml'
mvn-profile: 'docker'