diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2017-06-26 09:14:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-06-26 09:14:28 +0000 |
| commit | 69ed460ee03a3a784a98a1ae243f58414cedf0b4 (patch) | |
| tree | ae266e8b3f69b21e90e65fa0b6b5fc66fbd2eef6 /docker | |
| parent | 16a0d65806ca7bdb166e3d8535185a82b45ae7ff (diff) | |
| parent | 2f8ac31d3f70698d36bba6125ff46a654a7f24a9 (diff) | |
Merge "Install OPNFV sdnvpn via python package"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64 | 5 | ||||
| -rw-r--r-- | docker/thirdparty-requirements.txt | 1 |
3 files changed, 1 insertions, 10 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 4c3c76b86..6aff287a1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,7 +17,6 @@ ARG RALLY_TAG=0.8.1 ARG TEMPEST_TAG=15.0.0 ARG REFSTACK_TAG=15.0.0 ARG ODL_TAG=release/beryllium-sr4 -ARG OPENSTACK_TAG=stable/mitaka ARG KINGBIRD_TAG=1.1.0 ARG VIMS_TAG=stable ARG VROUTER_TAG=stable @@ -90,7 +89,6 @@ RUN ln -s /usr/local/lib/python2.7/dist-packages/functest ${FUNCTEST_REPO_DIR}/f # OPNFV repositories RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper -RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sdnvpn ${REPOS_DIR}/sdnvpn RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino ${REPOS_DIR}/domino RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/parser ${REPOS_DIR}/parser RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPOS_DIR}/doctor @@ -139,9 +137,6 @@ RUN curl -L https://get.rvm.io | bash -s stable RUN /bin/bash -c ". ${REPOS_DIR}/sfc/sfc/tests/functest/setup_scripts/tacker_client_install.sh" RUN cd ${REPOS_DIR}/sfc && pip install -e . -# SDNVPN integration -RUN cd ${REPOS_DIR}/sdnvpn && pip install -e . - # refstack-client integration RUN wget -q https://raw.githubusercontent.com/openstack/refstack-client/master/setup_env \ && bash setup_env -t ${REFSTACK_TAG} && rm setup_env diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index 272cf1fa8..c7bf4aba8 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -17,7 +17,6 @@ ARG RALLY_TAG=0.8.1 ARG TEMPEST_TAG=15.0.0 ARG REFSTACK_TAG=15.0.0 ARG ODL_TAG=release/beryllium-sr4 -ARG OPENSTACK_TAG=stable/mitaka ARG KINGBIRD_TAG=0.2.2 ARG VIMS_TAG=stable ARG REPOS_DIR=/home/opnfv/repos @@ -85,7 +84,6 @@ RUN pip install \ # OPNFV repositories RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper -RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sdnvpn ${REPOS_DIR}/sdnvpn RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino ${REPOS_DIR}/domino RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/parser ${REPOS_DIR}/parser RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPOS_DIR}/doctor @@ -131,9 +129,6 @@ RUN pip install ${REPOS_DIR}/opera RUN /bin/bash -c ". ${REPOS_DIR}/sfc/sfc/tests/functest/setup_scripts/tacker_client_install.sh" RUN cd ${REPOS_DIR}/sfc && pip install -e . -# SDNVPN integration -RUN cd ${REPOS_DIR}/sdnvpn && pip install -e . - # refstack-client integration RUN wget -q https://raw.githubusercontent.com/openstack/refstack-client/master/setup_env \ && bash setup_env -t ${REFSTACK_TAG} && rm setup_env diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt index 064b51850..a8be04a03 100644 --- a/docker/thirdparty-requirements.txt +++ b/docker/thirdparty-requirements.txt @@ -1,4 +1,5 @@ git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests +git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn networking-bgpvpn kingbird rally |