diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-08-28 17:24:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-28 17:24:04 +0000 |
| commit | 57b17a2223d8751f2c5eae660b706e2fc736a47c (patch) | |
| tree | 2531c3a7ea354ab9b8ddace0a411b0925842b381 /docker | |
| parent | 6b762e9edb2f7913348d99c1c240fe94b9f7cbf9 (diff) | |
| parent | 731a5bcfacc17c9189837d2af2d5dc1f0a95ccff (diff) | |
Merge "Kubernetes context adoption when run in CI"
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 $@ |