diff options
| author |   John O Loughlin <john.oloughlin@intel.com> | 2018-05-03 14:19:29 +0100 |
|---|---|---|
| committer |   Rex Lee <limingjiang@huawei.com> | 2018-06-30 06:58:15 +0000 |
| commit | 266baa2694e397e2a449ba15d08046ef5baeab9a (patch) | |
| tree | f352fe4423819f0710a6cc7126e704d10b08d479 /docker/Dockerfile | |
| parent | b07610535fc00ff02693942fca8b0a55995dc67e (diff) | |
Fix ansible scripts for running in container
JIRA: YARDSTICK-1147
Change-Id: I52dae85a2d97192bc8a48c5aeea3173b3d4de003
Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
(cherry picked from commit 5db2f11d309d42cdf7cf177b86d31deb3fe58e37)
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 2467329c4..d17108e61 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -31,13 +31,16 @@ RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 python-openstackclient==3.11.0 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 mkdir ${YARDSTICK_REPO_DIR} -COPY ./ ${YARDSTICK_REPO_DIR} +#For developers: To test your changes you must comment out the git clone for ${YARDSTICK_REPO_DIR}. +#You must also uncomment the RUN and COPY commands below. +#You must run docker build from your yardstick directory on the host. +RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/yardstick ${YARDSTICK_REPO_DIR} +#RUN mkdir ${YARDSTICK_REPO_DIR} +#COPY ./ ${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} -RUN ansible-playbook -vvv -e INSTALLATION_MODE="container" ${YARDSTICK_REPO_DIR}/ansible/install.yaml +RUN ansible-playbook -c local -vvv -e INSTALLATION_MODE="container" ${YARDSTICK_REPO_DIR}/ansible/install.yaml RUN ${YARDSTICK_REPO_DIR}/docker/supervisor.sh |