X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fci%2Fload_images.sh;h=caaba9e8b15affedc27ac9870441808f0a0811d7;hb=caa5354c05e567ee4c6753ed77c819dfa4e2a37e;hp=16395cb0ae8862b2739b20d6b2ded3d7a8f66b6f;hpb=c7114df918ca1d463e49a1c41805e8f414100e7c;p=yardstick.git

diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index 16395cb0a..caaba9e8b 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
@@ -45,26 +49,30 @@ build_yardstick_image()
     echo "========== Build yardstick cloud image =========="
 
     if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then
-        local cmd
-        cmd="sudo $(which yardstick-img-lxd-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh"
+        if [ ! -f "${RAW_IMAGE}" ];then
+            local cmd
+            cmd="sudo $(which yardstick-img-lxd-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh"
 
-        # Build the image. Retry once if the build fails
-        $cmd || $cmd
+            # Build the image. Retry once if the build fails
+            $cmd || $cmd
 
-        if [ ! -f "${RAW_IMAGE}" ]; then
-            echo "Failed building RAW image"
-            exit 1
+            if [ ! -f "${RAW_IMAGE}" ]; then
+                echo "Failed building RAW image"
+                exit 1
+            fi
         fi
     else
-        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
-
-        if [ ! -f "${QCOW_IMAGE}" ]; then
-            echo "Failed building QCOW image"
-            exit 1
+        if [ ! -f "${QCOW_IMAGE}" ];then
+            ANSIBLE_SCRIPTS="${0%/*}/../../ansible"
+            cd ${ANSIBLE_SCRIPTS} &&\
+            ansible-playbook \
+                     -e img_property="normal" \
+                     -vvv -i inventory.ini build_yardstick_image.yml
+
+            if [ ! -f "${QCOW_IMAGE}" ]; then
+                echo "Failed building QCOW image"
+                exit 1
+            fi
         fi
     fi
 }
@@ -74,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 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
@@ -115,7 +96,7 @@ load_yardstick_image()
     fi
 
     if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then
-        output=$(eval openstack image create \
+        output=$(eval openstack ${SECURE} image create \
             --public \
             --disk-format raw \
             --container-format bare \
@@ -123,7 +104,7 @@ load_yardstick_image()
             --file ${RAW_IMAGE} \
             yardstick-image)
     else
-        output=$(eval openstack image create \
+        output=$(eval openstack ${SECURE} image create \
             --public \
             --disk-format qcow2 \
             --container-format bare \
@@ -141,43 +122,54 @@ load_yardstick_image()
         exit 1
     fi
 
-    if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then
-        sudo rm -f -- "${RAW_IMAGE}"
-    else
-        sudo rm -f -- "${QCOW_IMAGE}"
-    fi
-
     echo "Glance image id: $GLANCE_IMAGE_ID"
 }
 
 load_cirros_image()
 {
-    echo
-    echo "========== Loading cirros cloud image =========="
-
-    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
-    if [[ "$DEPLOY_SCENARIO" == *"-fdio-"* ]]; then
-        EXTRA_PARAMS=$EXTRA_PARAMS" --property hw_mem_page_size=large"
+    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"
     fi
 
-    output=$(openstack image create \
-        --disk-format qcow2 \
-        --container-format bare \
-        ${EXTRA_PARAMS} \
-        --file ${image_file} \
-        cirros-0.3.5)
-    echo "$output"
+    if [[ -n $(openstack ${SECURE} image list | grep -e "${CIRROS_IMAGE_VERSION}") ]]; then
+        echo "${CIRROS_IMAGE_VERSION} image already exist, skip loading cirros image"
+    else
+        echo
+        echo "========== Loading cirros cloud image =========="
 
-    CIRROS_IMAGE_ID=$(echo "$output" | grep " id " | awk '{print $(NF-1)}')
-    if [ -z "$CIRROS_IMAGE_ID" ]; then
-        echo 'Failed uploading cirros image to cloud'.
-        exit 1
-    fi
+        local image_file="${CIRROS_IMAGE_PATH}"
+
+        # 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 \
+            ${EXTRA_PARAMS} \
+            --file ${image_file} \
+            cirros-0.3.5)
+        echo "$output"
 
-    echo "Cirros image id: $CIRROS_IMAGE_ID"
+        CIRROS_IMAGE_ID=$(echo "$output" | grep " id " | awk '{print $(NF-1)}')
+        if [ -z "$CIRROS_IMAGE_ID" ]; then
+            echo 'Failed uploading cirros image to cloud'.
+            exit 1
+        fi
+
+        echo "Cirros image id: $CIRROS_IMAGE_ID"
+    fi
 }
 
 load_ubuntu_image()
@@ -185,7 +177,7 @@ load_ubuntu_image()
     echo
     echo "========== Loading ubuntu cloud image =========="
 
-    local ubuntu_image_file=/home/opnfv/images/trusty-server-cloudimg-amd64-disk1.img
+    local ubuntu_image_file=/home/opnfv/images/xenial-server-cloudimg-amd64-disk1.img
 
     EXTRA_PARAMS=""
     # VPP requires guest memory to be backed by large pages
@@ -193,12 +185,12 @@ load_ubuntu_image()
         EXTRA_PARAMS=$EXTRA_PARAMS" --property hw_mem_page_size=large"
     fi
 
-    output=$(openstack image create \
+    output=$(openstack ${SECURE} image create \
         --disk-format qcow2 \
         --container-format bare \
         $EXTRA_PARAMS \
         --file $ubuntu_image_file \
-        Ubuntu-14.04)
+        Ubuntu-16.04)
     echo "$output"
 
     UBUNTU_IMAGE_ID=$(echo "$output" | grep " id " | awk '{print $(NF-1)}')
@@ -213,20 +205,27 @@ load_ubuntu_image()
 
 create_nova_flavor()
 {
-    if ! openstack flavor list | grep -q yardstick-flavor; then
+    if ! openstack ${SECURE} flavor list | grep -q yardstick-flavor; then
         echo
-        echo "========== Create nova flavor =========="
+        echo "========== Creating yardstick-flavor =========="
         # Create the nova flavor used by some sample test cases
-        openstack flavor create --id 100 --ram 512 --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 flavor set --property hw:mem_page_size=large yardstick-flavor
+            openstack ${SECURE} flavor set --property hw:mem_page_size=large yardstick-flavor
         fi
         # VPP requires guest memory to be backed by large pages
         if [[ "$DEPLOY_SCENARIO" == *"-fdio-"* ]]; then
-            openstack flavor set --property hw:mem_page_size=large yardstick-flavor
+            openstack ${SECURE} flavor set --property hw:mem_page_size=large yardstick-flavor
         fi
     fi
+
+    if ! openstack ${SECURE} flavor list | grep -q storperf; then
+        echo
+        echo "========== Creating storperf flavor =========="
+        # Create the nova flavor used by storperf test case
+        openstack ${SECURE} flavor create --id auto --ram 8192 --disk 4 --vcpus 2 storperf
+    fi
 }
 
 main()
@@ -234,19 +233,30 @@ main()
     QCOW_IMAGE="/tmp/workspace/yardstick/yardstick-image.img"
     RAW_IMAGE="/tmp/workspace/yardstick/yardstick-image.tar.gz"
 
+    if [ -f /home/opnfv/images/yardstick-image.img ];then
+        QCOW_IMAGE='/home/opnfv/images/yardstick-image.img'
+    fi
+    if [ -f /home/opnfv/images/yardstick-image.tar.gz ];then
+        RAW_IMAGE='/home/opnfv/images/yardstick-image.tar.gz'
+    fi
+
+    if [ $OS_INSECURE ] && [ "$(echo $OS_INSECURE | tr '[:upper:]' '[:lower:]')" = "true" ]; then
+        SECURE="--insecure"
+    else
+        SECURE=""
+    fi
+
     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
 }