summaryrefslogtreecommitdiffstats
path: root/jjb/joid
diff options
context:
space:
mode:
authorzhangyuanyou <zhangyuanyou@huawei.com>2016-08-22 19:47:21 +0800
committerzhangyuanyou <zhangyuanyou@huawei.com>2016-08-22 19:55:13 +0800
commitb609c6af698b9d9eba5061bcb06ab2ae31812985 (patch)
treec4301affdd2a696236dc2709ee8962ff9b9f157a /jjb/joid
parent6a2f3c5a315dc6a306c7ee94dc18a16daab2bd55 (diff)
[Joid] Recover config UBUNTU_DISTRO=trusty for onos-sfc
Because it was deleted by https://gerrit.opnfv.org/gerrit/#/c/18937/ Change-Id: Ic276ef624edbdb46801262e197c309a678b3ed1b Signed-off-by: Yuanyou Zhang<zhangyuanyou@huawei.com>
Diffstat (limited to 'jjb/joid')
-rw-r--r--jjb/joid/joid-deploy.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 575a5738c..05c2de1fc 100644
--- 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
##