Upgrade yardstick VM image from Ubuntu 14.04 to 16.04

JIRA: YARDSTICK-365

This patch upgrades the base Ubuntu version of Yardstick VM image from
trusty(14.04) to xenial(16.04).

If you still want to use Ubuntu 14.04 to build Yardstick custom image you can
use command:
    sudo ./tools/yardstick-img-modify tools/ubuntu-server-cloudimg-modify.sh trusty

And now the "yardstick-trusty-server" is rename as "yardstick-image".

Change-Id: I0765f3aee2d17eea1ad2257d0f576cdb9ef2b18d
Signed-off-by: JingLu5 <lvjing5@huawei.com>

16 files changed, 20 insertions, 20 deletions

diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh
index 05f68a7ed..b1942160b 100755
--- a/tests/ci/clean_images.sh
+++ b/tests/ci/clean_images.sh
@@ -19,7 +19,7 @@ cleanup()
         return
     fi
 
-    for image in $(glance image-list | grep -e cirros-0.3.3 -e yardstick-trusty-server -e Ubuntu-14.04 \
+    for image in $(glance image-list | grep -e cirros-0.3.3 -e yardstick-image -e Ubuntu-14.04 \
         -e yardstick-vivid-kernel | awk '{print $2}'); do
         echo "Deleting image $image..."
         glance image-delete $image || true
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index 49b972777..54a145fd3 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -90,14 +90,14 @@ load_yardstick_image()
 
     if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then
         output=$(eval glance --os-image-api-version 1 image-create \
-            --name yardstick-trusty-server \
+            --name yardstick-image \
             --is-public true --disk-format root-tar \
             --container-format bare \
             $EXTRA_PARAMS \
             --file $RAW_IMAGE)
     else
         output=$(eval glance --os-image-api-version 1 image-create \
-            --name yardstick-trusty-server \
+            --name yardstick-image \
             --is-public true --disk-format qcow2 \
             --container-format bare \
             $EXTRA_PARAMS \
@@ -203,8 +203,8 @@ create_nova_flavor()
 
 main()
 {
-    QCOW_IMAGE="/tmp/workspace/yardstick/yardstick-trusty-server.img"
-    RAW_IMAGE="/tmp/workspace/yardstick/yardstick-trusty-server.tar.gz"
+    QCOW_IMAGE="/tmp/workspace/yardstick/yardstick-image.img"
+    RAW_IMAGE="/tmp/workspace/yardstick/yardstick-image.tar.gz"
 
     build_yardstick_image
     load_yardstick_image
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc001.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc001.yaml
index 899ee963c..aa2980f69 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc001.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc001.yaml
@@ -31,7 +31,7 @@ scenarios:
 
 context:
   name: yardstick
-  image: yardstick-trusty-server
+  image: yardstick-image
   flavor: yardstick-flavor
   user: ubuntu
 
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml
index 6e50157fc..732d73af7 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml
@@ -35,7 +35,7 @@ scenarios:
 
 context:
   name: yardstick-TC005
-  image: yardstick-trusty-server
+  image: yardstick-image
   flavor: m1.small
   user: ubuntu
 
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc008.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc008.yaml
index 1cec80ff6..a2f5f3adc 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc008.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc008.yaml
@@ -37,7 +37,7 @@ scenarios:
 
 context:
   name: yardstick-TC008
-  image: yardstick-trusty-server
+  image: yardstick-image
   flavor: yardstick-flavor
   user: ubuntu
 
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc009.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc009.yaml
index 82a55d751..f9fa1b778 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc009.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc009.yaml
@@ -32,7 +32,7 @@ scenarios:
 
 context:
   name: yardstick-TC009
-  image: yardstick-trusty-server
+  image: yardstick-image
   flavor: yardstick-flavor
   user: ubuntu
 
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml
index aeb18543e..f64968cb1 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml
@@ -25,7 +25,7 @@ scenarios:
 
 context:
   name: yardstick-TC010
-  image: yardstick-trusty-server
+  image: yardstick-image
   flavor: m1.small
   user: ubuntu
 
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc011.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc011.yaml
index 5d21e2814..4cd3119bb 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc011.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc011.yaml
@@ -23,7 +23,7 @@ scenarios:
 
 context:
   name: demo
-  image: yardstick-trusty-server
+  image: yardstick-image
   flavor: yardstick-flavor
   user: ubuntu
 
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml
index 3bdb8cb9a..a86943a51 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml
@@ -26,7 +26,7 @@ scenarios:
 
 context:
   name: demo
-  image: yardstick-trusty-server
+  image: yardstick-image
   flavor: m1.small
   user: ubuntu
 
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc014.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc014.yaml
index 648657f22..1ac0f2961 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc014.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc014.yaml
@@ -19,7 +19,7 @@ scenarios:
 
 context:
   name: yardstick-TC014
-  image: yardstick-trusty-server
+  image: yardstick-image
   flavor: yardstick-flavor
   user: ubuntu
 
@@ -29,4 +29,4 @@ context:
 
   networks:
     test:
-      cidr: '10.0.1.0/24'
\ No newline at end of file
+      cidr: '10.0.1.0/24'
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml
index 5e2177a6e..cd42098d2 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml
@@ -64,7 +64,7 @@ scenarios:
 
 context:
   name: yardstick-TC037
-  image: yardstick-trusty-server
+  image: yardstick-image
   flavor: yardstick-flavor
   user: ubuntu
 
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc038.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc038.yaml
index 128f94045..c2e5b4028 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc038.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc038.yaml
@@ -64,7 +64,7 @@ scenarios:
 
 context:
   name: yardstick-TC038
-  image: yardstick-trusty-server
+  image: yardstick-image
   flavor: yardstick-flavor
   user: ubuntu
 
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc069.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc069.yaml
index 637e160c6..dcc34d80d 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc069.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc069.yaml
@@ -25,7 +25,7 @@ scenarios:
 
 context:
   name: yardstick-TC069
-  image: yardstick-trusty-server
+  image: yardstick-image
   flavor: yardstick-flavor
   user: ubuntu
 
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc070.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc070.yaml
index 28b28b9ab..931587b5b 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc070.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc070.yaml
@@ -66,7 +66,7 @@ scenarios:
 
 context:
   name: yardstick-TC070
-  image: yardstick-trusty-server
+  image: yardstick-image
   flavor: yardstick-flavor
   user: ubuntu
 
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc071.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc071.yaml
index 644010916..6f006eeaf 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc071.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc071.yaml
@@ -64,7 +64,7 @@ scenarios:
 
 context:
   name: yardstick-TC071
-  image: yardstick-trusty-server
+  image: yardstick-image
   flavor: yardstick-flavor
   user: ubuntu
 
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc072.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc072.yaml
index f3e6d4c40..e1fa33173 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc072.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc072.yaml
@@ -66,7 +66,7 @@ scenarios:
 
 context:
   name: yardstick-TC072
-  image: yardstick-trusty-server
+  image: yardstick-image
   flavor: yardstick-flavor
   user: ubuntu