diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2016-11-03 17:06:18 +0100 |
|---|---|---|
| committer |   Morgan Richomme <morgan.richomme@orange.com> | 2016-11-04 11:09:09 +0000 |
| commit | 0efb6a52cc73e4f32a82505ca7e58fc73ea2e55f (patch) | |
| tree | 5b28fb66dd0069e5a7202648db183e94ad80bb22 /docker | |
| parent | 82f18a401cee8c6f4a2395c6185052c2fcd0ba16 (diff) | |
Do not modify unix rights in case of unit tests
Even if the unit tests define main, nosetests oblige by default to
remove their executable bit. It also fixes the unix rights of Sfc.py.
Change-Id: Icbbb5b3118b16eff75b13d927e674a9764d6d83f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 9ff0f4f62..fd37e42fd 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -107,7 +107,8 @@ RUN pip install -r ${repos_dir}/functest/docker/requirements.pip RUN pip install -r ${repos_dir}/rally/requirements.txt RUN pip install -r ${repos_dir}/tempest/requirements.txt -RUN find ${repos_dir}/functest -name "*.py" |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 +RUN find ${repos_dir}/functest -name "*.py" \ + -not -path *unit_tests* |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 RUN find ${repos_dir}/functest -name "*.sh" |xargs grep \#\! |cut -d\: -f 1 |xargs chmod -c 755 RUN /bin/bash ${repos_dir}/parser/tests/parser_install.sh ${repos_dir} |