From: zhangyuanyou <zhangyuanyou@huawei.com>
Date: Mon, 22 Aug 2016 11:47:21 +0000 (+0800)
Subject: [Joid] Recover config UBUNTU_DISTRO=trusty for onos-sfc
X-Git-Tag: colorado.1.0~130
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b609c6af698b9d9eba5061bcb06ab2ae31812985;p=releng.git

[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>
---

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
 ##