From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 15 Dec 2016 14:06:35 +0000 (+0100)
Subject: Fix find in Dockerfile
X-Git-Tag: danube.1.RC1~243^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1041e01969b98b37b4c697aa2e8b99ff7df60ad7;p=functest.git

Fix find in Dockerfile

Unit tests has been moved to functest/tests/unit

Change-Id: I62175f04089eb4d12213e1c48ae1a5abbb540e2e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index eddf391f3..44437db07 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -125,7 +125,7 @@ RUN pip install -r ${REPOS_DIR}/rally/requirements.txt
 RUN pip install -r ${REPOS_DIR}/tempest/requirements.txt
 
 RUN find ${FUNCTEST_REPO_DIR} -name "*.py" \
-    -not -path *unit_tests* |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 \
+    -not -path "*tests/unit*" |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 \
     && find ${FUNCTEST_REPO_DIR} -name "*.sh" |xargs grep \#\! |cut -d\:  -f 1 |xargs chmod -c 755
 
 RUN /bin/bash ${REPOS_DIR}/parser/tests/parser_install.sh ${REPOS_DIR}