aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-08-10 14:07:57 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-10 14:07:57 +0000
commitc9dd12b85b2513c9ec576ed579a86ca901860397 (patch)
treea6c25bbb4b89cb9bf05dee8e203a1beac10961af /docker
parentda52e30ffe53f3fa961b5c432380d3e3d934b8de (diff)
parent376a9d68e3b5fd4956fb6cb5e6faa2fa746a6d80 (diff)
Merge "parser integration bugfix"
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile6
1 files changed, 1 insertions, 5 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index bc6d03936..9e4697897 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -88,12 +88,8 @@ RUN git clone https://gerrit.opnfv.org/gerrit/parser ${repos_dir}/parser
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 pip install -r ${repos_dir}/parser/tosca2heat/tosca-parser/requirements.txt
-RUN pip install -r ${repos_dir}/parser/tosca2heat/heat-translator/requirements.txt
-RUN cd ${repos_dir}/parser/tosca2heat/tosca-parser && python setup.py install
-RUN cd ${repos_dir}/parser/tosca2heat/heat-translator && python setup.py install
-
+RUN /bin/bash ${repos_dir}/parser/tests/parser_install.sh ${repos_dir}
RUN ${repos_dir}/rally/install_rally.sh --yes
ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img /home/opnfv/functest/data/