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/yardstick-verify | |
| 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/yardstick-verify')
| -rwxr-xr-x | ci/yardstick-verify | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ci/yardstick-verify b/ci/yardstick-verify index beb2170d3..be1c1250e 100755 --- a/ci/yardstick-verify +++ b/ci/yardstick-verify @@ -127,15 +127,13 @@ load_cirros_image() echo echo "========== Loading cirros cloud image ==========" - local image_file= - - wget http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img -O /tmp/cirros.img + local image_file=/home/opnfv/images/cirros-0.3.3-x86_64-disk.img output=$(glance image-create \ --name cirros-0.3.3 \ --disk-format qcow2 \ --container-format bare \ - --file /tmp/cirros.img) + --file $image_file) echo "$output" CIRROS_IMAGE_ID=$(echo "$output" | grep " id " | awk '{print $(NF-1)}') |