Merge "Bugfix: yardstick always report 'PASS' to DB"

[yardstick.git] / docker / Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 96a5d77..b48a550 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,6 +22,7 @@ ENV IMAGE_DIR /home/opnfv/images/
 # Yardstick repo
 ENV YARDSTICK_REPO_DIR ${REPOS_DIR}/yardstick
 ENV RELENG_REPO_DIR ${REPOS_DIR}/releng
+ENV STORPERF_REPO_DIR ${REPOS_DIR}/storperf
 
 RUN apt-get update && apt-get install -y git python-setuptools python-pip
 RUN easy_install -U setuptools==30.0.0
@@ -32,9 +33,11 @@ RUN mkdir -p ${REPOS_DIR}
 RUN git config --global http.sslVerify false
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/yardstick ${YARDSTICK_REPO_DIR}
 RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
+RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/storperf ${STORPERF_REPO_DIR}
 
 WORKDIR ${YARDSTICK_REPO_DIR}
 RUN ${YARDSTICK_REPO_DIR}/install.sh
+RUN ${YARDSTICK_REPO_DIR}/docker/supervisor.sh
 
 RUN echo "daemon off;" >> /etc/nginx/nginx.conf