diff options
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index f76dd7979..5105fbbd1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -32,7 +32,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container" ARG BRANCH=master ARG TEMPEST_TAG=12.2.0 ARG RALLY_TAG=0.7.0 -ARG ODL_TAG=release/beryllium-sr3 +ARG ODL_TAG=release/beryllium-sr4 ARG OPENSTACK_TAG=stable/mitaka ARG KINGBIRD_TAG=0.2.2 ARG VIMS_TAG=stable @@ -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} @@ -142,7 +142,13 @@ RUN curl -L https://get.rvm.io | bash -s stable RUN git clone --depth 1 https://gerrit.cablelabs.com/snaps-provisioning ${REPOS_DIR}/snaps RUN pip install -e ${REPOS_DIR}/snaps/ -RUN /bin/bash -c ". ${REPOS_DIR}/sfc/tests/functest/odl-sfc/tacker_client_install.sh" +# SFC integration +RUN /bin/bash -c ". ${REPOS_DIR}/sfc/sfc/tests/functest/setup_scripts/tacker_client_install.sh" +RUN cd ${REPOS_DIR}/sfc && pip install . + +# SDNVPN integration +RUN cd ${REPOS_DIR}/sdnvpn && pip install . + 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 |