X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fci%2Fload_images.sh;h=8e0a2f68a55fe5fc7784bf42942c39ad7c0c2144;hb=241b693baaec90347d08e63eb1dc167a0033ec21;hp=2e22b83c21508cd52c2e760d9eeec9fc3db30192;hpb=d2cb7ce7331d8da4c3b5b70b09dac49cf65d1710;p=yardstick.git

diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index 2e22b83c2..8e0a2f68a 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -88,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 \
@@ -119,7 +119,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 \
@@ -127,7 +127,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 \
@@ -145,24 +145,26 @@ 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()
 {
-    if [[ -n $(openstack image list | grep -e Cirros-0.3.5) ]]; then
-        echo "Cirros-0.3.5 image already exist, skip loading cirros 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
+
+    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 =========="
 
-        local image_file=/home/opnfv/images/cirros-0.3.5-x86_64-disk.img
+        local image_file="${CIRROS_IMAGE_PATH}"
 
         EXTRA_PARAMS=""
         # VPP requires guest memory to be backed by large pages
@@ -170,7 +172,7 @@ load_cirros_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} \
@@ -201,7 +203,7 @@ 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 \
@@ -221,26 +223,26 @@ 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 "========== 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 flavor list | grep -q storperf; then
+    if ! openstack ${SECURE} flavor list | grep -q storperf; then
         echo
         echo "========== Creating storperf flavor =========="
         # Create the nova flavor used by storperf test case
-        openstack flavor create --id auto --ram 8192 --disk 4 --vcpus 2 storperf
+        openstack ${SECURE} flavor create --id auto --ram 8192 --disk 4 --vcpus 2 storperf
     fi
 }
 
@@ -256,6 +258,12 @@ main()
         RAW_IMAGE='/home/opnfv/images/yardstick-image.tar.gz'
     fi
 
+    if [ $OS_CACERT ] && [ "$(echo $OS_CACERT | tr '[:upper:]' '[:lower:]')" = "false" ]; then
+        SECURE="--insecure"
+    else
+        SECURE=""
+    fi
+
     build_yardstick_image
     load_yardstick_image
     if [ "${YARD_IMG_ARCH}" == "arm64" ]; then