Code Review / releng.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 6a2f3c5)
[Joid] Recover config UBUNTU_DISTRO=trusty for onos-sfc 97/19197/2
authorzhangyuanyou <zhangyuanyou@huawei.com>
Mon, 22 Aug 2016 11:47:21 +0000 (19:47 +0800)
committerzhangyuanyou <zhangyuanyou@huawei.com>
Mon, 22 Aug 2016 11:55:13 +0000 (19:55 +0800)
Because it was deleted by https://gerrit.opnfv.org/gerrit/#/c/18937/

Change-Id: Ic276ef624edbdb46801262e197c309a678b3ed1b
Signed-off-by: Yuanyou Zhang<zhangyuanyou@huawei.com>
jjb/joid/joid-deploy.sh patch | blob | history

diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 575a573..05c2de1 100644 (file)
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -94,6 +94,11 @@ if [ "$EXTRA" != "" ];then
     NFV_FEATURES="${NFV_FEATURES}_${EXTRA}"
 fi
 
+# temporary sfc feature is availble only on onos and trusty
+if [ "$NFV_FEATURES" == 'sfc' ] && [ "$SDN_CONTROLLER" == 'onos' ];then
+    UBUNTU_DISTRO=trusty
+fi
+
 ##
 ## Configure Joid deployment
 ##