diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-06-15 20:48:21 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-06-20 16:02:59 +0200 |
commit | 572ef8dd7a109dead80c6f7a97aef34dc594c7c8 (patch) | |
tree | 648129f69b83d8e23b725377fcf8ac71e3f610c0 /docker/Dockerfile.aarch64 | |
parent | 739a151179af2fd69c8bca107f917811a4a3f6b4 (diff) |
Use directly OpenStack project packages
It stops cloning via git for the next OpenStack projects:
- networking-bgpvpn
- rally
- tempest
- kingbird
- refstack-client
It should be noted that refstack_client's setup_env is not designed
to run in Alpine.
Change-Id: I00d17912cad39a0c872d317317e98a78ca9ded2c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/Dockerfile.aarch64')
-rw-r--r-- | docker/Dockerfile.aarch64 | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index 4fbfeac44..0c1b0024d 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -80,13 +80,10 @@ RUN git config --global http.sslVerify false COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN pip install \ - git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \ - git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \ - git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \ - -r thirdparty-requirements.txt - -# Hook required by hardcoded paths in Functest -RUN ln -s /usr/local/lib/python2.7/dist-packages/functest ${FUNCTEST_REPO_DIR}/functest + git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \ + git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \ + git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \ + -r thirdparty-requirements.txt && rm thirdparty-requirements.txt # OPNFV repositories RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper @@ -99,21 +96,11 @@ RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sfc ${REPOS_D RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/securityscanning ${REPOS_DIR}/securityscanning RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/opera ${REPOS_DIR}/opera -# OpenStack repositories -RUN git clone --depth 1 -b $OPENSTACK_TAG https://github.com/openstack/networking-bgpvpn ${REPOS_DIR}/bgpvpn -RUN git clone --depth 1 -b $KINGBIRD_TAG https://github.com/openstack/kingbird.git ${REPOS_DIR}/kingbird -RUN git clone --depth 1 -b $RALLY_TAG https://github.com/openstack/rally.git ${REPOS_DIR}/rally -RUN git clone --depth 1 -b $TEMPEST_TAG https://github.com/openstack/tempest.git ${REPOS_DIR}/tempest -RUN git clone https://github.com/openstack/refstack-client ${REPOS_DIR}/refstack-client - # other repositories RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integration/test.git ${REPOS_DIR}/odl_test RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test ${REPOS_VNFS_DIR}/vims-test RUN git clone --depth 1 https://github.com/wuwenbin2/OnosSystemTest.git ${REPOS_DIR}/onos -RUN pip install -r ${REPOS_DIR}/rally/requirements.txt -RUN pip install -r ${REPOS_DIR}/tempest/requirements.txt - RUN find -L ${FUNCTEST_REPO_DIR} -name "*.py" \ -not -path "*tests/unit*" \ -not -path "*functest_venv*" \ @@ -131,7 +118,8 @@ RUN find -L ${FUNCTEST_REPO_DIR} -name "*.py" \ |xargs grep \#\! |cut -d\: -f 1 |xargs chmod -c 755 RUN /bin/bash ${REPOS_DIR}/parser/tests/parser_install.sh ${REPOS_DIR} -RUN ${REPOS_DIR}/rally/install_rally.sh --yes +RUN wget -q https://raw.githubusercontent.com/openstack/rally/${RALLY_TAG}/install_rally.sh \ + && bash install_rally.sh --yes && rm install_rally.sh RUN add_images.sh @@ -146,13 +134,10 @@ RUN cd ${REPOS_DIR}/sfc && pip install -e . # SDNVPN integration RUN cd ${REPOS_DIR}/sdnvpn && pip install -e . -RUN cd ${REPOS_DIR}/bgpvpn && pip install -e . - -# Kingbird integration -RUN cd ${REPOS_DIR}/kingbird && pip install -e . -r test-requirements.txt # refstack-client integration -RUN cd ${REPOS_DIR}/refstack-client && ./setup_env -t ${REFSTACK_TAG} +RUN wget -q https://raw.githubusercontent.com/openstack/refstack-client/master/setup_env \ + && bash setup_env -t ${REFSTACK_TAG} && rm setup_env RUN /bin/bash -c ". /etc/profile.d/rvm.sh \ && cd ${REPOS_VNFS_DIR}/vims-test \ |