aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwutianwei <wutianwei1@huawei.com>2017-09-14 16:16:22 +0800
committerwutianwei <wutianwei1@huawei.com>2017-09-14 16:52:19 +0800
commit17ae50e2679eb52f1e4d4b51aa1e49039935465a (patch)
treebd6bcc614277a6f59c1c627dad8fc78de445c66d
parent42ddbcc2fc6d091c1d137809343be63886822e5b (diff)
Run k8s in CI
Add k8s DHA file k8s-nosdn-nofeature-ha.yml when run k8s-nosdn-nofeature-ha scenario, export two variables COMPASS_OS_VERSION=centos7 KUBERNETES_VERSION="v1.7.3" Change-Id: I9012598e6d46b20f325e93aba92f03da444d97a2 Signed-off-by: wutianwei <wutianwei1@huawei.com>
-rwxr-xr-xci/deploy_ci.sh4
-rw-r--r--deploy/conf/vm_environment/k8-nosdn-nofeature-ha.yml42
2 files changed, 46 insertions, 0 deletions
diff --git a/ci/deploy_ci.sh b/ci/deploy_ci.sh
index 55a0129..5fa19ce 100755
--- a/ci/deploy_ci.sh
+++ b/ci/deploy_ci.sh
@@ -18,6 +18,10 @@ 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 [[ $ROOT_BUILD_CAUSE == MANUALTRIGGER ]]; then
diff --git a/deploy/conf/vm_environment/k8-nosdn-nofeature-ha.yml b/deploy/conf/vm_environment/k8-nosdn-nofeature-ha.yml
new file mode 100644
index 0000000..d098afb
--- /dev/null
+++ b/deploy/conf/vm_environment/k8-nosdn-nofeature-ha.yml
@@ -0,0 +1,42 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+TYPE: virtual
+FLAVOR: cluster
+
+hosts:
+ - name: host1
+ roles:
+ - controller
+ - ha
+ - ceph-adm
+ - ceph-mon
+
+ - name: host2
+ roles:
+ - controller
+ - ha
+ - ceph-mon
+
+ - name: host3
+ roles:
+ - controller
+ - ha
+ - ceph-mon
+
+ - name: host4
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host5
+ roles:
+ - compute
+ - ceph-osd