X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fci%2Fload_images.sh;h=c2ae4fe7b9c805e353d12d19bad26de880b8f1b7;hb=6edd83fc43c9a6e37ad5875d6fe202bb29fdc110;hp=047393797c00ca9915e4bd2bf1736cb23ba919aa;hpb=892d2e536e46a6e6427c061931c58f80b542589d;p=yardstick.git

diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index 047393797..c2ae4fe7b 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -15,23 +15,24 @@ set -e
 YARD_IMG_ARCH=amd64
 export YARD_IMG_ARCH
 
-HW_FW_TYPE=""
-if [ "${YARD_IMG_ARCH}" == "arm64" ]; then
-    HW_FW_TYPE=uefi
-fi
-export HW_FW_TYPE
-
 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
 
-ARCH_SCRIPT="test -f /etc/fuel_openstack_arch && grep -q arm64 /etc/fuel_openstack_arch"
+# 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
 fi
 
+HW_FW_TYPE=""
+if [ "${YARD_IMG_ARCH}" == "arm64" ]; then
+    HW_FW_TYPE=uefi
+fi
+export HW_FW_TYPE
+
 UCA_HOST="cloud-images.ubuntu.com"
-if [ "${YARD_IMG_ARCH}"= "arm64" ]; then
+if [ "${YARD_IMG_ARCH}" == "arm64" ]; then
     export CLOUD_IMG_URL="http://${UCA_HOST}/${release}/current/${release}-server-cloudimg-${YARD_IMG_ARCH}.tar.gz"
     if ! grep -q "Defaults env_keep += \"CLOUD_IMG_URL\"" "/etc/sudoers"; then
         echo "Defaults env_keep += \"CLOUD_IMG_URL\"" | sudo tee -a /etc/sudoers
@@ -44,26 +45,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"
+        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
+            # 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
+                echo "Failed building QCOW image"
+                exit 1
+            fi
         fi
     fi
 }
@@ -83,7 +88,7 @@ load_yardstick_image()
         if [ ! -f "${CLOUD_KERNEL}" ]; then
             tar xf "${CLOUD_IMAGE}" "${CLOUD_KERNEL##**/}"
         fi
-        create_kernel=$(openstack image create \
+        create_kernel=$(openstack ${SECURE} image create \
                 --public \
                 --disk-format qcow2 \
                 --container-format bare \
@@ -114,15 +119,15 @@ load_yardstick_image()
     fi
 
     if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then
-        output=$(eval openstack image create \
+        output=$(eval openstack ${SECURE} image create \
             --public \
-            --disk-format root-tar \
+            --disk-format raw \
             --container-format bare \
             ${EXTRA_PARAMS} \
             --file ${RAW_IMAGE} \
             yardstick-image)
     else
-        output=$(eval openstack image create \
+        output=$(eval openstack ${SECURE} image create \
             --public \
             --disk-format qcow2 \
             --container-format bare \
@@ -140,43 +145,49 @@ 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 =========="
+    if [[ "${YARD_IMG_ARCH}" == "arm64" ]]; then
+        CIRROS_IMAGE_VERSION="cirros-d161201"
+        CIRROS_IMAGE_PATH="/home/opnfv/images/cirros-d161201-aarch64-disk.img"
+    else
+        CIRROS_IMAGE_VERSION="Cirros-0.3.5"
+        CIRROS_IMAGE_PATH="/home/opnfv/images/cirros-0.3.5-x86_64-disk.img"
+    fi
 
-    local image_file=/home/opnfv/images/cirros-0.3.3-x86_64-disk.img
+    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 =========="
 
-    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
+        local image_file="${CIRROS_IMAGE_PATH}"
 
-    output=$(openstack image create \
-        --disk-format qcow2 \
-        --container-format bare \
-        ${EXTRA_PARAMS} \
-        --file ${image_file} \
-        cirros-0.3.3)
-    echo "$output"
+        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
 
-    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
+        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()
@@ -184,7 +195,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
@@ -192,12 +203,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)}')
@@ -212,20 +223,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 3 --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()
@@ -233,11 +251,24 @@ 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: 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.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}"