From 0f77068d9edabb55053e30b4a13f5fe17005f678 Mon Sep 17 00:00:00 2001
From: "jose.lausuch" <jose.lausuch@ericsson.com>
Date: Thu, 8 Oct 2015 10:14:37 +0200
Subject: [PATCH] Add small checks to avoid possible 'No such file or
 directory' errors in the Docker automation procedure

JIRA: FUNCTEST-29

Change-Id: Ib8629d9c0f64a046cdbec27cb1bdced3e49c72bb
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---
 docker/start.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/docker/start.sh b/docker/start.sh
index bd2308caf..60a21d1f6 100644
--- a/docker/start.sh
+++ b/docker/start.sh
@@ -134,9 +134,13 @@ rally verify list
 echo "Functest: copy results and clean Functest environment"
 
 # save ODL results
-cp -Rf ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/logs ${FUNCTEST_RESULTS_DIR}/ODL
+odl_logs="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/logs"
+if [ -d ${tempest_conf} ]; then
+    cp -Rf  ${odl_logs} ${FUNCTEST_CONF_DIR}/ODL/
+fi
 
 # save tempest.conf for further troubleshooting
-cp $RALLY_VENV/tempest/for-deployment-*/tempest.conf ${FUNCTEST_CONF_DIR}
-
-
+tempest_conf="${RALLY_VENV}/tempest/for-deployment-*/tempest.conf"
+if [ -f ${tempest_conf} ]; then
+    cp $tempest_conf ${FUNCTEST_CONF_DIR}
+fi
\ No newline at end of file
-- 
2.16.6