diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-07-08 02:44:10 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-07-08 18:23:03 +0200 |
| commit | c46924bb00b6e6e0bf3d7e12125cb1455eaaa943 (patch) | |
| tree | ef1eba0fb863ca5d09c5f216c704b4bebcae06ed | |
| parent | 7c46badb8a1957d99a982228d71a3ee9f63bcd29 (diff) | |
Get rid of install_rally.sh
It simply creates the required db.
Change-Id: I48fb017f3ebfcdbd5de898b185c1933228bfef16
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | docker/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64 | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 80db3c9b1..4465e9182 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -81,6 +81,9 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe 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 && \ + mkdir -p /etc/rally && \ + printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ + mkdir -p /var/lib/rally/database && rally-manage db create && \ rm thirdparty-requirements.txt upper-constraints.txt # OPNFV repositories @@ -97,9 +100,6 @@ RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwat RUN git clone --depth 1 -b $VROUTER_TAG https://github.com/oolorg/opnfv-functest-vrouter.git ${REPOS_VNFS_DIR}/vrouter RUN git clone --depth 1 https://github.com/wuwenbin2/OnosSystemTest.git ${REPOS_DIR}/onos -RUN wget -q https://git.openstack.org/cgit/openstack/rally/plain/install_rally.sh?h=${RALLY_TAG} -O install_rally.sh \ - && bash install_rally.sh --branch ${RALLY_TAG} --yes && rm install_rally.sh - RUN add_images.sh RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index 274db865b..496d351b8 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -80,6 +80,9 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe 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 && \ + mkdir -p /etc/rally && \ + printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ + mkdir -p /var/lib/rally/database && rally-manage db create && \ rm thirdparty-requirements.txt upper-constraints.txt # OPNFV repositories @@ -93,9 +96,6 @@ RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integr 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 wget -q https://git.openstack.org/cgit/openstack/rally/plain/install_rally.sh?h=${RALLY_TAG} -O install_rally.sh \ - && bash install_rally.sh --branch ${RALLY_TAG} --yes && rm install_rally.sh - RUN add_images.sh RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 |