From 9430923f95c4b69e2a4b7579f7a55933a4cc7449 Mon Sep 17 00:00:00 2001
From: Cristina Pauna <cristina.pauna@enea.com>
Date: Fri, 6 Oct 2017 18:19:32 +0300
Subject: Update load_images.sh to MCP@aarch64

The load_images.sh script still contained old functionality.
The changes are:
- don't use TestVM anymore, MCP does not load that by default like Fuel did
  upload the cirros image instead
- don't upload the kernel separately for aarch64, one part image works now
- add the needed extra-properties accordingly to each image

The script was tested on arm, the test are running now without errors

JIRA: ARMBAND-285

Change-Id: Iee8ce6cde43bebceb2edbb1310ea81c665876aff
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
(cherry picked from commit af71c468fe83a5149e0e18cdb233e059302209e3)
---
 tests/ci/load_images.sh | 42 +++++++++---------------------------------
 1 file changed, 9 insertions(+), 33 deletions(-)

(limited to 'tests')

diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index 689d919e2..e73d7e800 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -82,35 +82,8 @@ load_yardstick_image()
     echo
     echo "========== Loading yardstick cloud image =========="
     EXTRA_PARAMS=""
-    if [[ "${YARD_IMG_ARCH}" == "arm64" && "${YARD_IMG_AKI}" == "true" ]]; then
-        CLOUD_IMAGE="/tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.tar.gz"
-        CLOUD_KERNEL="/tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}-vmlinuz-generic"
-        cd /tmp
-        if [ ! -f "${CLOUD_IMAGE}" ]; then
-            wget "${CLOUD_IMG_URL}"
-        fi
-        if [ ! -f "${CLOUD_KERNEL}" ]; then
-            tar xf "${CLOUD_IMAGE}" "${CLOUD_KERNEL##**/}"
-        fi
-        create_kernel=$(openstack ${SECURE} image create \
-                --public \
-                --disk-format qcow2 \
-                --container-format bare \
-                --file ${CLOUD_KERNEL} \
-                yardstick-${release}-kernel)
-
-        GLANCE_KERNEL_ID=$(echo "$create_kernel" | awk '/ id / {print $(NF-1)}')
-        if [ -z "$GLANCE_KERNEL_ID" ]; then
-            echo 'Failed uploading kernel to cloud'.
-            exit 1
-        fi
-
-        command_line="root=/dev/vdb1 console=tty0 console=ttyS0 console=ttyAMA0 rw"
-
-        EXTRA_PARAMS="--property kernel_id=$GLANCE_KERNEL_ID --property os_command_line=\"$command_line\""
-
-        rm -f -- "${CLOUD_KERNEL}" "${CLOUD_IMAGE}"
-        cd "${YARDSTICK_REPO_DIR}"
+    if [[ "${YARD_IMG_ARCH}" == "arm64" ]]; then
+        EXTRA_PARAMS="--property hw_video_model=vga"
     fi
 
     # VPP requires guest memory to be backed by large pages
@@ -154,9 +127,11 @@ load_yardstick_image()
 
 load_cirros_image()
 {
+    EXTRA_PARAMS=""
     if [[ "${YARD_IMG_ARCH}" == "arm64" ]]; then
         CIRROS_IMAGE_VERSION="cirros-d161201"
         CIRROS_IMAGE_PATH="/home/opnfv/images/cirros-d161201-aarch64-disk.img"
+        EXTRA_PARAMS="--property hw_video_model=vga --property short_id=ubuntu16.04"
     else
         CIRROS_IMAGE_VERSION="Cirros-0.3.5"
         CIRROS_IMAGE_PATH="/home/opnfv/images/cirros-0.3.5-x86_64-disk.img"
@@ -170,12 +145,15 @@ load_cirros_image()
 
         local image_file="${CIRROS_IMAGE_PATH}"
 
-        EXTRA_PARAMS=""
         # VPP requires guest memory to be backed by large pages
         if [[ "$DEPLOY_SCENARIO" == *"-fdio-"* ]]; then
             EXTRA_PARAMS=$EXTRA_PARAMS" --property hw_mem_page_size=large"
         fi
 
+        if [[ -n "${HW_FW_TYPE}" ]]; then
+            EXTRA_PARAMS=$EXTRA_PARAMS" --property hw_firmware_type=${HW_FW_TYPE}"
+        fi
+
         output=$(openstack ${SECURE} image create \
             --disk-format qcow2 \
             --container-format bare \
@@ -271,16 +249,14 @@ main()
     build_yardstick_image
     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.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}"
         done
     else
-        load_cirros_image
         load_ubuntu_image
     fi
+    load_cirros_image
     create_nova_flavor
 }
 
-- 
cgit 1.2.3-korg