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>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 80db3c9..4465e91 100644 (file)
--- 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 274db86..496d351 100644 (file)
--- 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