X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fci%2Fload_images.sh;h=d723823ee754cb5e0ed37fd579a983cc17ebd5f4;hb=e49c33827a359d7c80030cf44efafa65722380c4;hp=c2ae4fe7b9c805e353d12d19bad26de880b8f1b7;hpb=69049e54f6b6611bdaa9dbab9e6dc6a123583251;p=yardstick.git

diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index c2ae4fe7b..d723823ee 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -13,17 +13,21 @@
 set -e
 
 YARD_IMG_ARCH=amd64
-export YARD_IMG_ARCH
 
 if ! grep -q "Defaults env_keep += \"YARD_IMG_ARCH\"" "/etc/sudoers"; then
     echo "Defaults env_keep += \"YARD_IMG_ARCH YARDSTICK_REPO_DIR\"" | sudo tee -a /etc/sudoers
 fi
 
 # Look for a compute node, that is online, and check if it is aarch64
-ARCH_SCRIPT="ssh \$(fuel2 node list | awk -F'|' '\$6 ~ /compute/ && \$11 ~ /rue/ {print \$7; exit;}') uname -m 2>/dev/null | grep -q aarch64"
-if [ "$INSTALLER_TYPE" == "fuel" ]; then
-    sshpass -p r00tme ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -l root "${INSTALLER_IP}" "${ARCH_SCRIPT}" && YARD_IMG_ARCH=arm64
+if [ "${INSTALLER_TYPE}" == 'fuel' ]; then
+    ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+    COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \
+        "sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'")
+    if [ "${COMPUTE_ARCH}" == 'aarch64' ]; then
+        YARD_IMG_ARCH=arm64
+    fi
 fi
+export YARD_IMG_ARCH
 
 HW_FW_TYPE=""
 if [ "${YARD_IMG_ARCH}" == "arm64" ]; then
@@ -59,11 +63,12 @@ build_yardstick_image()
         fi
     else
         if [ ! -f "${QCOW_IMAGE}" ];then
-            local cmd
-            cmd="sudo $(which yardstick-img-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh"
-
-            # Build the image. Retry once if the build fails
-            $cmd || $cmd
+            ANSIBLE_SCRIPTS="${0%/*}/../../ansible"
+            cd ${ANSIBLE_SCRIPTS} &&\
+            ansible-playbook \
+                     -e img_property="normal" \
+                     -e YARD_IMG_ARCH=${YARD_IMG_ARCH} \
+                     -vvv -i inventory.ini build_yardstick_image.yml
 
             if [ ! -f "${QCOW_IMAGE}" ]; then
                 echo "Failed building QCOW image"
@@ -78,35 +83,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
@@ -150,11 +128,13 @@ 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_VERSION="cirros-0.3.5"
         CIRROS_IMAGE_PATH="/home/opnfv/images/cirros-0.3.5-x86_64-disk.img"
     fi
 
@@ -166,12 +146,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 \
@@ -227,7 +210,7 @@ create_nova_flavor()
         echo
         echo "========== Creating yardstick-flavor =========="
         # Create the nova flavor used by some sample test cases
-        openstack ${SECURE} flavor create --id 100 --ram 1024 --disk 3 --vcpus 1 yardstick-flavor
+        openstack ${SECURE} flavor create --id 100 --ram 1024 --disk 10 --vcpus 1 yardstick-flavor
         # DPDK-enabled OVS requires guest memory to be backed by large pages
         if [[ $DEPLOY_SCENARIO == *[_-]ovs[_-]* ]]; then
             openstack ${SECURE} flavor set --property hw:mem_page_size=large yardstick-flavor
@@ -267,16 +250,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
 }