diff options
Diffstat (limited to 'docker')
| -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 749c8b122..898cc4ca0 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 |