diff options
| -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 b204ca9c4..a9810b216 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -30,7 +30,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container" ARG BRANCH=stable/colorado ARG TEMPEST_TAG=12.2.0 -ARG RALLY_TAG=0.3.2 +ARG RALLY_TAG=0.5.0 ARG ODL_TAG=release/beryllium-sr3 ARG OPENSTACK_TAG=stable/mitaka ARG KINGBIRD_TAG=0.2.2 @@ -104,7 +104,6 @@ RUN git clone --depth 1 https://github.com/wuwenbin2/OnosSystemTest.git ${repos_ RUN pip install -r ${repos_dir}/rally/requirements.txt RUN pip install -r ${repos_dir}/tempest/requirements.txt -RUN pip install -r ${repos_dir}/functest/docker/requirements.pip RUN find ${repos_dir}/functest -name "*.py" |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 @@ -124,6 +123,8 @@ RUN cd ${repos_dir}/bgpvpn && pip install . #RUN cd ${repos_dir}/kingbird && pip install -e . RUN cd ${repos_dir}/moon/moonclient/ && python setup.py install +RUN pip install --upgrade -r ${repos_dir}/functest/docker/requirements.pip + RUN /bin/bash -c ". /etc/profile.d/rvm.sh \ && cd /home/opnfv/repos/vims-test \ && rvm autolibs enable" diff --git a/docker/requirements.pip b/docker/requirements.pip index 13bdb0390..69a1f06fd 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.5.0 python-neutronclient==4.1.2 virtualenv==1.11.4 pexpect==4.0 |