diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-03-24 17:55:39 +0400 |
|---|---|---|
| committer |   Jing Lu <lvjing5@huawei.com> | 2017-03-30 08:31:23 +0000 |
| commit | aa499064bf305e41a56a2f86d17c1cc29a1d7b0c (patch) | |
| tree | 49dd8e6325c98f15c25b634e21af377a7383e9b7 /tests | |
| parent | 42f2d416079ebe41a1f4d7a01cdb7896a871ad51 (diff) | |
Update cirros image to latest version
Change-Id: Iffa1e4529e5b6e9664ac503a5815ea9a034d7515
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 043727feabaf7cabb719dbd3d52274bcd0dbea66)
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/ci/clean_images.sh | 2 | ||||
| -rwxr-xr-x | tests/ci/load_images.sh | 6 | ||||
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh index 2d0db83bd..9e5e61edf 100755 --- a/tests/ci/clean_images.sh +++ b/tests/ci/clean_images.sh @@ -19,7 +19,7 @@ cleanup() return fi - for image in $(openstack image list | grep -e cirros-0.3.3 -e yardstick-image -e Ubuntu-14.04 \ + for image in $(openstack image list | grep -e cirros-0.3.5 -e yardstick-image -e Ubuntu-14.04 \ | awk '{print $2}'); do echo "Deleting image $image..." openstack image delete $image || true diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh index 7f929bdc4..4be51fd15 100755 --- a/tests/ci/load_images.sh +++ b/tests/ci/load_images.sh @@ -155,7 +155,7 @@ load_cirros_image() echo echo "========== Loading cirros cloud image ==========" - local image_file=/home/opnfv/images/cirros-0.3.3-x86_64-disk.img + local image_file=/home/opnfv/images/cirros-0.3.5-x86_64-disk.img EXTRA_PARAMS="" # VPP requires guest memory to be backed by large pages @@ -168,7 +168,7 @@ load_cirros_image() --container-format bare \ ${EXTRA_PARAMS} \ --file ${image_file} \ - cirros-0.3.3) + cirros-0.3.5) echo "$output" CIRROS_IMAGE_ID=$(echo "$output" | grep " id " | awk '{print $(NF-1)}') @@ -245,7 +245,7 @@ main() load_yardstick_image if [ "${YARD_IMG_ARCH}" == "arm64" ]; then sed -i 's/image: {{image}}/image: TestVM/g' tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml - sed -i 's/image: cirros-0.3.3/image: TestVM/g' samples/ping.yaml + sed -i 's/image: cirros-0.3.5/image: TestVM/g' samples/ping.yaml #We have overlapping IP with the real network for filename in tests/opnfv/test_cases/*; do sed -i "s/cidr: '10.0.1.0\/24'/cidr: '10.3.1.0\/24'/g" "${filename}" diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml index 21aa3ee7b..1de573d83 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml @@ -13,7 +13,7 @@ description: > Yardstick TC002 config file; measure network latency using ping; -{% set image = image or "cirros-0.3.3" %} +{% set image = image or "cirros-0.3.5" %} scenarios: {% for i in range(2) %} - |