Update cirros image to latest version

Change-Id: Iffa1e4529e5b6e9664ac503a5815ea9a034d7515
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 043727feabaf7cabb719dbd3d52274bcd0dbea66)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a1b88fe..248a6ab 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -73,7 +73,7 @@ RUN ${YARDSTICK_REPO_DIR}/api/api-prepare.sh
 
 EXPOSE 5000
 
-ADD http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img /home/opnfv/images/
+ADD http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img /home/opnfv/images/
 ADD http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img /home/opnfv/images/
 
 COPY ./exec_tests.sh /usr/local/bin/

diff --git a/docs/testing/user/userguide/04-installation.rst b/docs/testing/user/userguide/04-installation.rst
index c1db212..64955c7 100644 (file)
--- a/docs/testing/user/userguide/04-installation.rst
+++ b/docs/testing/user/userguide/04-installation.rst
@@ -285,7 +285,7 @@ Example command:
   --file /tmp/workspace/yardstick/yardstick-image.img
 
 Some Yardstick test cases use a Cirros image and a Ubuntu 14.04 image, you can find one at
-http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img, https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
+http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img, https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
 
 Add cirros and ubuntu image to OpenStack:
 
@@ -295,7 +295,7 @@ Add cirros and ubuntu image to OpenStack:
       --disk-format qcow2 \
       --container-format bare \
       --file $cirros_image_file \
-      cirros-0.3.3
+      cirros-0.3.5
 
   openstack image create \
       --disk-format qcow2 \

diff --git a/samples/ping-ext-ip.yaml b/samples/ping-ext-ip.yaml
index 86cb799..33dd181 100644 (file)
--- a/samples/ping-ext-ip.yaml
+++ b/samples/ping-ext-ip.yaml
@@ -31,7 +31,7 @@ scenarios:
 
 context:
   name: demo
-  image: cirros-0.3.3
+  image: cirros-0.3.5
   flavor: yardstick-flavor
   user: cirros
   servers:

diff --git a/samples/ping-ext-stimuli.yaml b/samples/ping-ext-stimuli.yaml
index 5de5281..e0895f1 100644 (file)
--- a/samples/ping-ext-stimuli.yaml
+++ b/samples/ping-ext-stimuli.yaml
@@ -44,7 +44,7 @@ scenarios:
 
 context:
   name: demo
-  image: cirros-0.3.3
+  image: cirros-0.3.5
   flavor: yardstick-flavor
   user: cirros
   servers:

diff --git a/samples/ping-heat-context.yaml b/samples/ping-heat-context.yaml
index dd22d58..db34ca0 100644 (file)
--- a/samples/ping-heat-context.yaml
+++ b/samples/ping-heat-context.yaml
@@ -32,7 +32,7 @@ scenarios:
 context:
   type: Heat
   name: demo
-  image: cirros-0.3.3
+  image: cirros-0.3.5
   flavor: yardstick-flavor
   user: cirros
 

diff --git a/samples/ping-hot.yaml b/samples/ping-hot.yaml
index 4182518..c636634 100644 (file)
--- a/samples/ping-hot.yaml
+++ b/samples/ping-hot.yaml
@@ -40,7 +40,7 @@ context:
   user: cirros
   heat_template: /tmp/heat-templates/hot/servers_in_new_neutron_net.yaml
   heat_parameters:
-    image: cirros-0.3.3
+    image: cirros-0.3.5
     flavor: yardstick-flavor
     key_name: yardstick
     public_net: "660fc7c3-7a56-4faf-91e5-3c9ebdda0104"

diff --git a/samples/ping-iteration.yaml b/samples/ping-iteration.yaml
index dea2396..bd34119 100755 (executable)
--- a/samples/ping-iteration.yaml
+++ b/samples/ping-iteration.yaml
@@ -31,7 +31,7 @@ scenarios:
 
 context:
   name: demo
-  image: cirros-0.3.3
+  image: cirros-0.3.5
   flavor: yardstick-flavor
   user: cirros
 

diff --git a/samples/ping-multiple-context.yaml b/samples/ping-multiple-context.yaml
index 557b384..7180dae 100644 (file)
--- a/samples/ping-multiple-context.yaml
+++ b/samples/ping-multiple-context.yaml
@@ -31,7 +31,7 @@ scenarios:
 contexts:
 -
   name: demo1
-  image: cirros-0.3.3
+  image: cirros-0.3.5
   flavor: yardstick-flavor
   user: cirros
   placement_groups:
@@ -46,7 +46,7 @@ contexts:
       cidr: '10.0.1.0/24'
 -
   name: demo2
-  image: cirros-0.3.3
+  image: cirros-0.3.5
   flavor: yardstick-flavor
   user: cirros
   placement_groups:

diff --git a/samples/ping-multiple-vm.yaml b/samples/ping-multiple-vm.yaml
index 993c82f..7eae130 100644 (file)
--- a/samples/ping-multiple-vm.yaml
+++ b/samples/ping-multiple-vm.yaml
@@ -35,7 +35,7 @@ scenarios:
 
 context:
   name: demo
-  image: cirros-0.3.3
+  image: cirros-0.3.5
   flavor: yardstick-flavor
   user: cirros
 

diff --git a/samples/ping-option-list.yaml b/samples/ping-option-list.yaml
index fa81fda..8444319 100644 (file)
--- a/samples/ping-option-list.yaml
+++ b/samples/ping-option-list.yaml
@@ -29,7 +29,7 @@ scenarios:
 
 context:
   name: demo
-  image: cirros-0.3.3
+  image: cirros-0.3.5
   flavor: yardstick-flavor
   user: cirros
 

diff --git a/samples/ping-parallel.yaml b/samples/ping-parallel.yaml
index 0da57ec..8600cbb 100644 (file)
--- a/samples/ping-parallel.yaml
+++ b/samples/ping-parallel.yaml
@@ -43,7 +43,7 @@ scenarios:
 
 context:
   name: demo
-  image: cirros-0.3.3
+  image: cirros-0.3.5
   flavor: yardstick-flavor
   user: cirros
 

diff --git a/samples/ping-serial.yaml b/samples/ping-serial.yaml
index ab06167..419c945 100644 (file)
--- a/samples/ping-serial.yaml
+++ b/samples/ping-serial.yaml
@@ -42,7 +42,7 @@ scenarios:
 
 context:
   name: demo
-  image: cirros-0.3.3
+  image: cirros-0.3.5
   flavor: yardstick-flavor
   user: cirros
 

diff --git a/samples/ping-template.yaml b/samples/ping-template.yaml
index fabee07..a732734 100644 (file)
--- a/samples/ping-template.yaml
+++ b/samples/ping-template.yaml
@@ -36,7 +36,7 @@ scenarios:
 
 context:
   name: demo
-  image: cirros-0.3.3
+  image: cirros-0.3.5
   flavor: yardstick-flavor
   user: cirros
 

diff --git a/samples/ping.yaml b/samples/ping.yaml
index b95c135..0c1783c 100644 (file)
--- a/samples/ping.yaml
+++ b/samples/ping.yaml
@@ -31,7 +31,7 @@ scenarios:
 
 context:
   name: demo
-  image: cirros-0.3.3
+  image: cirros-0.3.5
   flavor: yardstick-flavor
   user: cirros
 

diff --git a/samples/ping_bottlenecks.yaml b/samples/ping_bottlenecks.yaml
index 910bcff..01977a1 100644 (file)
--- a/samples/ping_bottlenecks.yaml
+++ b/samples/ping_bottlenecks.yaml
@@ -34,7 +34,7 @@ contexts:
 {% for num in range(stack_num) %}
 -
   name: demo{{num}}
-  image: cirros-0.3.3
+  image: cirros-0.3.5
   flavor: yardstick-flavor
   user: cirros
 

diff --git a/samples/ping_load.yaml b/samples/ping_load.yaml
index 805ae8f..2afb131 100644 (file)
--- a/samples/ping_load.yaml
+++ b/samples/ping_load.yaml
@@ -34,7 +34,7 @@ scenarios:
 contexts:
 -
   name: demo1
-  image: cirros-0.3.3
+  image: cirros-0.3.5
   flavor: yardstick-flavor
   user: cirros
 
@@ -58,7 +58,7 @@ contexts:
       cidr: '10.0.1.0/24'
 -
   name: demo2
-  image: cirros-0.3.3
+  image: cirros-0.3.5
   flavor: yardstick-flavor
   user: cirros
   placement_groups:

diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh
index 2d0db83..9e5e61e 100755 (executable)
--- 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 7f929bd..4be51fd 100755 (executable)
--- 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 21aa3ee..1de573d 100644 (file)
--- 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) %}
 -