X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fci%2Fyardstick-verify;h=f3e7a49e3378bb4a602a77c7f4fc18ee9f68f0f9;hb=b3c51ed384eb538f1458512dbab312c53d6de134;hp=16df3bb5966c5a4c3301f82dccdbc758b2eba3ff;hpb=f12a0c1a56da2238d8fc4f4b840bf4f3a0b0f1d5;p=yardstick.git

diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify
index 16df3bb59..f3e7a49e3 100755
--- a/tests/ci/yardstick-verify
+++ b/tests/ci/yardstick-verify
@@ -34,6 +34,7 @@ OPTIONS:
    -h      Show this message
    -r      Http target (example: -r 213.77.62.197/results)
    -i      Influxdb target (example: -i 127.0.0.1:8086)
+   -m      Reporting target (example: -m 213.77.62.197/results)
 
            Default target is dump to file ($DISPATCHER_FILE_NAME)
 
@@ -44,14 +45,9 @@ DISPATCHER_TYPE=file
 DISPATCHER_FILE_NAME="/tmp/yardstick.out"
 DISPATCHER_HTTP_TARGET="http://testresults.opnfv.org/test/api/v1/results"
 DISPATCHER_INFLUXDB_TARGET=
-UCA_HOST="cloud-images.ubuntu.com"
-if [ $YARD_IMG_ARCH = "arm64" ]; then
-    export VIVID_IMG_URL="http://${UCA_HOST}/vivid/current/vivid-server-cloudimg-arm64.tar.gz"
-    if ! grep -q "Defaults env_keep += \"VIVID_IMG_URL\"" "/etc/sudoers"; then
-        sudo echo "Defaults env_keep += \"VIVID_IMG_URL\"" >> /etc/sudoers
-    fi
-fi
-while getopts "r:i:h" OPTION; do
+REPORTING_TARGET="${DISPATCHER_HTTP_TARGET}"
+
+while getopts "r:i:m:h" OPTION; do
     case $OPTION in
         h)
             usage
@@ -67,6 +63,9 @@ while getopts "r:i:h" OPTION; do
             DISPATCHER_INFLUXDB_TARGET=http://${OPTARG}
             DISPATCHER_FILE_NAME=
             ;;
+        m)
+            REPORTING_TARGET=http://${OPTARG}
+            ;;
         *)
             echo "${OPTION} is not a valid argument"
             exit 1
@@ -77,24 +76,6 @@ done
 shift $[OPTIND - 1]
 TEST_SUITES=$@
 
-cleanup()
-{
-    echo
-    echo "========== Cleanup =========="
-
-    if ! glance image-list; then
-        return
-    fi
-
-    for image in $(glance image-list | grep -e cirros-0.3.3 -e yardstick-trusty-server -e Ubuntu-14.04 \
-        -e yardstick-vivid-kernel | awk '{print $2}'); do
-        echo "Deleting image $image..."
-        glance image-delete $image || true
-    done
-
-    nova flavor-delete yardstick-flavor &> /dev/null || true
-}
-
 exitcode=""
 
 error_exit()
@@ -106,7 +87,9 @@ error_exit()
         exitcode=$rc
     fi
 
-    cleanup
+    if [[ "${DEPLOY_SCENARIO:0:2}" == 'os' ]];then
+        source "${YARDSTICK_REPO_DIR}/tests/ci/clean_images.sh"
+    fi
 
     echo "Exiting with RC=$exitcode"
 
@@ -116,22 +99,10 @@ error_exit()
 set -o errexit
 set -o pipefail
 
-install_yardstick()
-{
-    echo
-    echo "========== Installing yardstick =========="
-
-    # uninstall previous version
-    pip uninstall -y yardstick || true
-
-    # Install yardstick
-    pip install .
-}
-
 install_storperf()
 {
-    # Install Storper on huawei-pod1
-    if [ "$NODE_NAME" == "huawei-pod1" ]; then
+    # Install Storper on huawei-pod1 and huawei-pod2
+    if [ "$NODE_NAME" == "huawei-pod1" -o "$NODE_NAME" == "huawei-pod2" ]; then
         echo
         echo "========== Installing storperf =========="
 
@@ -145,8 +116,8 @@ install_storperf()
 
 remove_storperf()
 {
-    # remove Storper from huawei-pod1
-    if [ "$NODE_NAME" == "huawei-pod1" ]; then
+    # remove Storper from huawei-pod1 and huawei-pod2
+    if [ "$NODE_NAME" == "huawei-pod1" -o "$NODE_NAME" == "huawei-pod2" ]; then
         echo
         echo "========== Removing storperf =========="
 
@@ -158,139 +129,6 @@ remove_storperf()
     fi
 }
 
-build_yardstick_image()
-{
-    echo
-    echo "========== Build yardstick cloud image =========="
-
-    local 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
-    fi
-}
-
-create_nova_flavor()
-{
-    if ! nova flavor-list | grep -q yardstick-flavor; then
-        echo
-        echo "========== Create nova flavor =========="
-        # Create the nova flavor used by some sample test cases
-        nova flavor-create yardstick-flavor 100 512 3 1
-        # DPDK-enabled OVS requires guest memory to be backed by large pages
-        if [[ "$DEPLOY_SCENARIO" == *"-ovs-"* ]]; then
-            nova flavor-key yardstick-flavor set hw:mem_page_size=large
-        fi
-    fi
-}
-
-load_cirros_image()
-{
-    echo
-    echo "========== Loading cirros cloud image =========="
-
-    local image_file=/home/opnfv/images/cirros-0.3.3-x86_64-disk.img
-
-    output=$(glance image-create \
-        --name  cirros-0.3.3 \
-        --disk-format $DISK_FORMAT \
-        --container-format bare \
-        --file $image_file)
-    echo "$output"
-
-    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"
-}
-
-load_ubuntu_image()
-{
-    echo
-    echo "========== Loading ubuntu cloud image =========="
-
-    local ubuntu_image_file=/home/opnfv/images/trusty-server-cloudimg-amd64-disk1.img
-
-    output=$(glance image-create \
-        --name Ubuntu-14.04 \
-        --disk-format qcow2 \
-        --container-format bare \
-        --file $ubuntu_image_file)
-    echo "$output"
-
-    UBUNTU_IMAGE_ID=$(echo "$output" | grep " id " | awk '{print $(NF-1)}')
-
-    if [ -z "$UBUNTU_IMAGE_ID" ]; then
-        echo 'Failed uploading UBUNTU image to cloud'.
-        exit 1
-    fi
-
-    echo "Ubuntu image id: $UBUNTU_IMAGE_ID"
-}
-
-load_yardstick_image()
-{
-    echo
-    echo "========== Loading yardstick cloud image =========="
-    EXTRA_PARAMS=""
-    if [ $YARD_IMG_ARCH = "arm64" ]; then
-        VIVID_IMAGE="/tmp/vivid-server-cloudimg-arm64.tar.gz"
-        VIVID_KERNEL="/tmp/vivid-server-cloudimg-arm64-vmlinuz-generic"
-        cd /tmp
-        if [ ! -f $VIVID_IMAGE ]; then
-            wget $VIVID_IMG_URL
-        fi
-        if [ ! -f $VIVID_KERNEL ]; then
-            tar zxf $VIVID_IMAGE $(basename $VIVID_KERNEL)
-        fi
-        create_vivid_kernel=$(glance --os-image-api-version 1 image-create \
-                --name yardstick-vivid-kernel \
-                --is-public true --disk-format qcow2 \
-                --container-format bare \
-                --file $VIVID_KERNEL)
-
-        GLANCE_KERNEL_ID=$(echo "$create_vivid_kernel" | grep " id " | awk '{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 $VIVID_KERNEL $VIVID_IMAGE
-        cd $YARDSTICK_REPO_DIR
-    fi
-
-    output=$(eval glance --os-image-api-version 1 image-create \
-        --name yardstick-trusty-server \
-        --is-public true --disk-format $DISK_FORMAT \
-        --container-format bare \
-        $EXTRA_PARAMS \
-        --file $QCOW_IMAGE)
-
-    echo "$output"
-
-    GLANCE_IMAGE_ID=$(echo "$output" | grep " id " | awk '{print $(NF-1)}')
-
-    if [ -z "$GLANCE_IMAGE_ID" ]; then
-        echo 'Failed uploading image to cloud'.
-        exit 1
-    fi
-
-    sudo rm -f $QCOW_IMAGE
-
-    echo "Glance image id: $GLANCE_IMAGE_ID"
-}
-
 report(){
 
     echo
@@ -303,11 +141,11 @@ report(){
           \"version\":\"$(basename ${YARDSTICK_BRANCH})\",
           \"scenario\":\"${DEPLOY_SCENARIO}\",
           \"description\": \"yardstick ci scenario status\",
-          \"criteria\":\"$1\",
-          \"start_date\":\"$2\",
-          \"stop_date\":\"$3\",
+          \"criteria\":\"${1}\",
+          \"start_date\":\"${2}\",
+          \"stop_date\":\"${3}\",
           \"details\":\"\"}" \
-          ${DISPATCHER_HTTP_TARGET}
+          "${REPORTING_TARGET}"
 }
 
 run_test()
@@ -317,9 +155,9 @@ run_test()
 
     mkdir -p /etc/yardstick
 
-    cat << EOF >> /etc/yardstick/yardstick.conf
+    cat << EOF > /etc/yardstick/yardstick.conf
 [DEFAULT]
-debug = True
+debug = False
 dispatcher = ${DISPATCHER_TYPE}
 
 [dispatcher_file]
@@ -377,7 +215,7 @@ EOF
             scenario_status="FAILED"
         fi
 
-        report $scenario_status $start_date $stop_date
+        report "${scenario_status}" "${start_date}" "${stop_date}"
 
         if [ $failed -gt 0 ]; then
             echo "---------------------------"
@@ -412,6 +250,38 @@ EOF
 
 }
 
+check_openstack(){
+    # check if some necessary variables is set
+    if [ -z "$OS_AUTH_URL" ]; then
+        echo "OS_AUTH_URL is unset or empty"
+        exit 1
+    fi
+
+    echo "OS_AUTH_URL is $OS_AUTH_URL"
+    echo
+
+    # check OpenStack services
+    if [[ $OS_INSECURE ]] && [[ "$(echo $OS_INSECURE | tr '[:upper:]' '[:lower:]')" = "true" ]]; then
+        SECURE="--insecure"
+    else
+        SECURE=""
+    fi
+    echo "Checking OpenStack services:"
+    for cmd in "openstack ${SECURE} image list" "openstack ${SECURE} server list" "openstack ${SECURE} stack list"; do
+        echo "  checking ${cmd} ..."
+        if ! $cmd >/dev/null; then
+            echo "error: command \"$cmd\" failed"
+            exit 1
+        fi
+    done
+
+    echo
+    echo "Checking for External network:"
+    for net in $(openstack network list --external -c Name -f value); do
+        echo "  external network: $net"
+    done
+}
+
 main()
 {
     GITROOT=$(cd $(dirname $0) && git rev-parse --show-toplevel)
@@ -447,60 +317,15 @@ main()
     done
     echo
 
-    # check if some necessary variables is set
-    if [ -z "$OS_AUTH_URL" ]; then
-        echo "OS_AUTH_URL is unset or empty"
-        exit 1
-    fi
-
-    echo "OS_AUTH_URL is $OS_AUTH_URL"
-    echo
-
-    # check OpenStack services
-    echo "Checking OpenStack services:"
-    for cmd in "glance image-list" "nova list" "heat stack-list"; do
-        echo "  checking ${cmd/%\ */} ..."
-        if ! $cmd >/dev/null; then
-            echo "error: command \"$cmd\" failed"
-            exit 1
-        fi
-    done
-
-    echo
-    echo "Checking for External network:"
-    for net in $(neutron net-list --router:external True -c name -f value); do
-        echo "  external network: $net"
-    done
-
-    # install yardstick
-    install_yardstick
-
-    cleanup
-
     trap "error_exit" EXIT SIGTERM
 
-    QCOW_IMAGE="/tmp/workspace/yardstick/yardstick-trusty-server.img"
+    if [[ "${DEPLOY_SCENARIO:0:2}" == "os" ]];then
+        check_openstack
 
-    if [ "$DEPLOY_SCENARIO" == "os-nosdn-lxd-ha" -o "$DEPLOY_SCENARIO" == "os-nosdn-lxd-noha" ]; then
-        DISK_FORMAT="raw"
-    else
-        DISK_FORMAT="qcow2"
+        source $YARDSTICK_REPO_DIR/tests/ci/clean_images.sh
+        source $YARDSTICK_REPO_DIR/tests/ci/load_images.sh
     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
-        #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
-    create_nova_flavor
     install_storperf
     run_test
     remove_storperf