From 39b528c2b706a91d79f35b8a1c65852a5f4556a8 Mon Sep 17 00:00:00 2001
From: Chris Donley <christopher.donley@huawei.com>
Date: Fri, 20 Apr 2018 13:22:03 -0700
Subject: 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>
---
 jjb/vnfsdk/vnfsdk-ice-python.yaml | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'jjb')

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'
-- 
cgit