Bugfix: TC002 image error in fuel-arm pod scenarios 63/31463/1
authorJingLu5 <lvjing5@huawei.com>
Thu, 23 Mar 2017 01:14:43 +0000 (01:14 +0000)
committerJing Lu <lvjing5@huawei.com>
Thu, 23 Mar 2017 02:47:48 +0000 (02:47 +0000)
JIRA: YARDSTICK-601

This error is cause because the TC 002 configuration file has been modified in
image section, the old sed command in load_images.sh
"sed -i 's/image: cirros-0.3.3/image: TestVM/g' tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml samples/ping.yaml" didn't work properly.

Change-Id: Ie897213622d05bb267f94b466eb2529e797d484e
Signed-off-by: JingLu5 <lvjing5@huawei.com>
(cherry picked from commit 2fb078e21a3cd0dc69732f33b5a6ecc422eb577d)

tests/ci/load_images.sh

index ee46962..6aefe2d 100755 (executable)
@@ -236,8 +236,8 @@ main()
     build_yardstick_image
     load_yardstick_image
     if [ "${YARD_IMG_ARCH}" == "arm64" ]; then
-        sed -i 's/image: cirros-0.3.3/image: TestVM/g' tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml \
-        samples/ping.yaml
+        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
         #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}"