diff options
| author |   Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com> | 2015-12-07 18:51:22 +0100 |
|---|---|---|
| committer | Jörgen Karlsson <jorgen.w.karlsson@ericsson.com> | 2015-12-08 15:09:22 +0000 |
| commit | 70c27f24d07411103fb63090d17390f5ea249ebc (patch) | |
| tree | 8e831abdde3f7d0c3bc67b79e8358d0d120cb71f /ci/docker/yardstick-ci/Dockerfile | |
| parent | 7dcceb89768b2ab2de9d88718978c850afd092dd (diff) | |
Docker image cleanup
- Renamed docker image 'opnfv/yardstick-ci' -> 'opnfv/yardstick'
as recommended by project.
- Added cirros image and releng repo to docker image in order to
make it more usable in offline mode.
- Renamed run_benchmarks to run_tests.sh
- Moved some environment setups to a new file prepare_env.sh
- Added daily test suites file for ericsson and LF pods.
Docker image is now built and pushed by releng script:
https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=blob;f=jjb/opnfv/opnfv-docker.sh
The ci/docker/Makefile file is not used by releng to build yardstick
image but the makefile can still be used to build and test docker
images locally.
Change-Id: If9d6740b39e91d145c587d8d5e2bd372d09a46a9
Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
Diffstat (limited to 'ci/docker/yardstick-ci/Dockerfile')
| -rw-r--r-- | ci/docker/yardstick-ci/Dockerfile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ci/docker/yardstick-ci/Dockerfile b/ci/docker/yardstick-ci/Dockerfile index 9a1e83262..229b91227 100644 --- a/ci/docker/yardstick-ci/Dockerfile +++ b/ci/docker/yardstick-ci/Dockerfile @@ -9,13 +9,14 @@ FROM ubuntu:14.04 -LABEL image=opnfv/yardstick-ci +LABEL image=opnfv/yardstick # GIT repo directory ENV REPOS_DIR /home/opnfv/repos # Yardstick repo ENV YARDSTICK_REPO_DIR ${REPOS_DIR}/yardstick +ENV RELENG_REPO_DIR ${REPOS_DIR}/releng RUN apt-get update && apt-get install -y \ wget \ @@ -37,5 +38,9 @@ RUN mkdir -p ${REPOS_DIR} RUN git config --global http.sslVerify false RUN git clone https://gerrit.opnfv.org/gerrit/yardstick ${YARDSTICK_REPO_DIR} +RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR} + +ADD http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img /home/opnfv/images/ + +COPY ./run_tests.sh /usr/local/bin/ -COPY ./run_benchmarks /usr/local/bin/ |