diff options
| author |   John O Loughlin <john.oloughlin@intel.com> | 2018-05-03 14:19:29 +0100 |
|---|---|---|
| committer | John O'Loughlin <john.oloughlin@intel.com> | 2018-05-03 16:32:28 +0000 |
| commit | 5db2f11d309d42cdf7cf177b86d31deb3fe58e37 (patch) | |
| tree | 5d526986d42a448d411ef667ec74d683511f23ee /docker/Dockerfile | |
| parent | a114dc39f003beb1bb1ed12ed17fd3a6d0e7deaa (diff) | |
Fix ansible scripts for running in container
JIRA: YARDSTICK-1147
Change-Id: I52dae85a2d97192bc8a48c5aeea3173b3d4de003
Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
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 098877c48..5813f0245 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 |