aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2018-02-27 07:20:53 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-27 07:20:53 +0000
commit4c4ac1bc245b2ce119cb7f1ea27a0dfe83f26c0c (patch)
tree22b0303c24312b573384054d3c7b82580aefeb0b
parent6f811d4cc23e46b24aa8e2e358e01ed0dbf29259 (diff)
parent29e930d1abc38b7345c66660bfea85365b7ac345 (diff)
Merge "set the kubernetes variable"
-rwxr-xr-xci/deploy_ci.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/ci/deploy_ci.sh b/ci/deploy_ci.sh
index bd5adcc..dd8786a 100755
--- a/ci/deploy_ci.sh
+++ b/ci/deploy_ci.sh
@@ -18,12 +18,13 @@ case $DEPLOY_SCENARIO in
echo "os-onos-sfc-ha scenario supports mitaka only"
exit 1
;;
- k8-nosdn-nofeature-ha)
- export COMPASS_OS_VERSION=centos7
- export KUBERNETES_VERSION="v1.7.3"
- ;;
esac
+if [[ "$DEPLOY_SCENARIO" =~ "k8-" ]]; then
+ export KUBERNETES_VERSION="v1.7.3"
+fi
+
+
if [[ "$NODE_NAME" =~ "intel-pod17" ]]; then
export USER_NAMESERVER=8.8.8.8
fi