diff options
| author |   chenjiankun <chenjiankun1@huawei.com> | 2017-08-28 09:55:05 +0000 |
|---|---|---|
| committer | chenjiankun <chenjiankun1@huawei.com> | 2017-08-28 09:55:05 +0000 |
| commit | 731a5bcfacc17c9189837d2af2d5dc1f0a95ccff (patch) | |
| tree | b51f0537dffb2009813b42d5afccc4af235c1355 /docker | |
| parent | 952ccb549c08b620a35f20ae809e0cea88ae4d99 (diff) | |
Kubernetes context adoption when run in CI
JIRA: YARDSTICK-801
We need kubernetes test case run in CI.
We have one scenario k8-nosdb-lb-noha for kubernetes.
But for now, we need to do some adoption in CI script.
Also I move check OS_AUTH_URL in heat.py.
Change-Id: Iff86caf77fd74e70469ad2dc43f2238097ce0001
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/exec_tests.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/exec_tests.sh b/docker/exec_tests.sh index 46e5a05bd..93e017f49 100755 --- a/docker/exec_tests.sh +++ b/docker/exec_tests.sh @@ -96,8 +96,10 @@ fi cd ${YARDSTICK_REPO_DIR} git_checkout ${YARDSTICK_BRANCH} -# setup the environment -source ${YARDSTICK_REPO_DIR}/tests/ci/prepare_env.sh +if [[ "${DEPLOY_SCENARIO:0:2}" == "os" ]];then + # setup the environment + source ${YARDSTICK_REPO_DIR}/tests/ci/prepare_env.sh +fi # execute tests ${YARDSTICK_REPO_DIR}/tests/ci/yardstick-verify $@ |