From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Tue, 22 Dec 2015 16:22:49 +0000 (+0100)
Subject: Move check_os call to prepare_env.sh
X-Git-Tag: 0.2~1861
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f1a15b02f20c91a617e7475d8ca506db6db10005;p=functest-xtesting.git

Move check_os call to prepare_env.sh

Change-Id: Ifcc9ef24975f83f6c0ee021c76cc056f383f3f5e
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---

diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index 0c618bff..6127e2cd 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 00d53487..7ae67869 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