diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2015-12-22 17:22:49 +0100 |
|---|---|---|
| committer | jose.lausuch <jose.lausuch@ericsson.com> | 2015-12-22 17:22:49 +0100 |
| commit | f1a15b02f20c91a617e7475d8ca506db6db10005 (patch) | |
| tree | 4c9b650de3404ae144501001352eb226d1b53a7f | |
| parent | 13c0c2d15d2af4dd1a8b4f82e481a8d1574c274d (diff) | |
Move check_os call to prepare_env.sh
Change-Id: Ifcc9ef24975f83f6c0ee021c76cc056f383f3f5e
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
| -rwxr-xr-x | docker/prepare_env.sh | 7 | ||||
| -rwxr-xr-x | docker/run_tests.sh | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh index 0c618bff8..6127e2cd5 100755 --- a/docker/prepare_env.sh +++ b/docker/prepare_env.sh @@ -188,6 +188,13 @@ fi # Source credentials source ${FUNCTEST_CONF_DIR}/openstack.creds +# Check OpenStack +info "Checking that the basic OpenStack services are functional..." +${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/check_os.sh +RETVAL=$? +if [ $RETVAL -ne 0 ]; then + exit 1 +fi # Prepare Functest Environment info "Functest: prepare Functest environment" diff --git a/docker/run_tests.sh b/docker/run_tests.sh index 00d534871..7ae678697 100755 --- a/docker/run_tests.sh +++ b/docker/run_tests.sh @@ -175,14 +175,6 @@ fi info "Sourcing Credentials ${FUNCTEST_CONF_DIR}/openstack.creds to run the tests.." source ${FUNCTEST_CONF_DIR}/openstack.creds -# Check OpenStack -info "Checking that the basic OpenStack services are functional..." -${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/check_os.sh -RETVAL=$? -if [ $RETVAL -ne 0 ]; then - exit 1 -fi - # Run tests if [ "${TEST}" != "" ]; then for i in "${arr_test_exec[@]}"; do |