diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/requirements.pip | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 9ff0f4f62..c5553d9dc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -53,7 +53,7 @@ git \ gcc \ wget \ python-dev \ -python-mock \ +python-mock \ python-pip \ bundler \ postgresql \ @@ -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} diff --git a/docker/requirements.pip b/docker/requirements.pip index 6c3a195fc..c3f77997c 100644 --- a/docker/requirements.pip +++ b/docker/requirements.pip @@ -11,7 +11,7 @@ pyyaml==3.10 gitpython==1.0.1 python-openstackclient==2.3.0 python-ceilometerclient==1.5.1 -python-keystoneclient==2.3.1 +python-keystoneclient==3.6.0 python-neutronclient==4.1.1 virtualenv==1.11.4 pexpect==4.0 |