Revert rally version to 0.8.1

1. Now rally version 0.9.1 is installed via "bash install_rally.sh
   --yes", cause the default RALLY_GIT_BRANCH is master. Then
   some rally related tests will fail as rally tests have not been
   updated in functest
2. rally version 0.8.1 can be installed via --branch 0.8.1

Change-Id: I04003134f070a1a35db2c02f2209e77365be592f
Signed-off-by: Linda Wang <wangwulin@huawei.com>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 95c4df3..0b413d9 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -129,7 +129,7 @@ RUN find -L ${FUNCTEST_REPO_DIR} -name "*.py" \
 
 RUN /bin/bash ${REPOS_DIR}/parser/tests/parser_install.sh ${REPOS_DIR}
 RUN wget -q https://raw.githubusercontent.com/openstack/rally/${RALLY_TAG}/install_rally.sh \
-    && bash install_rally.sh --yes && rm install_rally.sh
+    && bash install_rally.sh --branch ${RALLY_TAG} --yes && rm install_rally.sh
 
 RUN add_images.sh
 

diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index 0c1b002..9eaeb3f 100644 (file)
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -119,7 +119,7 @@ RUN find -L ${FUNCTEST_REPO_DIR} -name "*.py" \
 
 RUN /bin/bash ${REPOS_DIR}/parser/tests/parser_install.sh ${REPOS_DIR}
 RUN wget -q https://raw.githubusercontent.com/openstack/rally/${RALLY_TAG}/install_rally.sh \
-    && bash install_rally.sh --yes && rm install_rally.sh
+    && bash install_rally.sh --branch ${RALLY_TAG} --yes && rm install_rally.sh
 
 RUN add_images.sh