X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf-ligato.sh;h=e72673d4f80bd3dca3948b6dc90997efa5f484f4;hp=66549723521ac2f57351daaf31a303d2b8d1da8f;hb=9739ad805d43b7e92468b643c1f300f4a0651b70;hpb=6e25bb5e8b8bcc2a1f741892508a68aec7d791b9 diff --git a/bootstrap-verify-perf-ligato.sh b/bootstrap-verify-perf-ligato.sh index 6654972352..e72673d4f8 100644 --- a/bootstrap-verify-perf-ligato.sh +++ b/bootstrap-verify-perf-ligato.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2018 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -25,9 +25,12 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" RESERVATION_DIR="/tmp/reservation_dir" INSTALLATION_DIR="/tmp/install_dir" -PYBOT_ARGS="-W 150 -L TRACE" - -ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.xml) +JOB_ARCHIVE_ARTIFACTS=(log.html output.xml report.html) +LOG_ARCHIVE_ARTIFACTS=(log.html output.xml report.html) +JOB_ARCHIVE_DIR="archive" +LOG_ARCHIVE_DIR="$WORKSPACE/archives" +mkdir -p ${JOB_ARCHIVE_DIR} +mkdir -p ${LOG_ARCHIVE_DIR} # If we run this script from CSIT jobs we want to use stable vpp version if [[ ${JOB_NAME} == csit-* ]] ; @@ -35,8 +38,7 @@ then mkdir -p vpp/build-root cd vpp/build-root - if [[ ${TEST_TAG} == *NIGHTLY ]] || \ - [[ ${TEST_TAG} == *DAILY ]] || \ + if [[ ${TEST_TAG} == *DAILY ]] || \ [[ ${TEST_TAG} == *WEEKLY ]]; then # Download the latest VPP build .deb install packages @@ -62,7 +64,6 @@ then VPP_DEBS="$( readlink -f *.deb | tr '\n' ' ' )" fi - dpkg -x vpp-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb /tmp/vpp # Temporary workaround as ligato docker file requires specific file name rename -v 's/^(.*)-(\d.*)-deb.deb/$1_$2.deb/' *.deb cd ${SCRIPT_DIR} @@ -78,19 +79,19 @@ then VPP_STABLE_VER="$( expr match $1 'vpp-\(.*\)-deb.deb' )" # Move files to build-root for packing for deb in ${VPP_DEBS}; do mv ${deb} vpp/build-root/; done - dpkg -x vpp/build-root/vpp_${VPP_STABLE_VER}.deb /tmp/vpp else echo "Unable to identify job type based on JOB_NAME variable: ${JOB_NAME}" exit 1 fi +# Extract VPP API to specific folder +dpkg -x vpp/build-root/vpp_${VPP_STABLE_VER}.deb /tmp/vpp # Compress all VPP debs and remove temporary directory -tar -zcvf ${SCRIPT_DIR}/vpp.tar.gz vpp/* && rm -R vpp +tar -zcvf ${SCRIPT_DIR}/vpp.tar.gz vpp/* && rm -R vpp LIGATO_REPO_URL=$(cat ${SCRIPT_DIR}/LIGATO_REPO_URL) VPP_AGENT_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_AGENT_STABLE_VER) -VPP_AGENT_STABLE_COMMIT="$( expr match `cat VPP_AGENT_STABLE_VER` '.*g\(.*\)' )" -DOCKER_DEB="docker-ce_17.09.0~ce-0~ubuntu_amd64.deb" +DOCKER_DEB="docker-ce_18.03.0~ce-0~ubuntu_amd64.deb" # Clone & checkout stable vnf-agent cd .. && git clone ${LIGATO_REPO_URL}/vpp-agent @@ -99,7 +100,7 @@ if [ $? != 0 ]; then echo "Failed to run: git clone --depth 1 ${LIGATO_REPO_URL}/vpp-agent" exit 1 fi -cd vpp-agent && git checkout ${VPP_AGENT_STABLE_COMMIT} +cd vpp-agent && git checkout ${VPP_AGENT_STABLE_VER} # If the git checkout fails, complain clearly and exit if [ $? != 0 ]; then echo "Failed to run: git checkout ${VPP_AGENT_STABLE_VER}" @@ -119,7 +120,6 @@ fi sudo docker pull ligato/dev-vpp-agent:${VPP_AGENT_STABLE_VER} sudo docker tag ligato/dev-vpp-agent:${VPP_AGENT_STABLE_VER}\ dev_vpp_agent:latest -sudo docker images # Start dev_vpp_agent container as daemon sudo docker run --rm -itd --name agentcnt dev_vpp_agent bash @@ -127,7 +127,11 @@ sudo docker run --rm -itd --name agentcnt dev_vpp_agent bash sudo docker cp /tmp/vpp/usr/share/vpp/api agentcnt:/usr/share/vpp # Recompile vpp-agent sudo docker exec -i agentcnt \ - script -qc '. ~/.bashrc; cd /root/go/src/github.com/ligato/vpp-agent && make generate && make install' + script -qec '. ~/.bashrc; cd /root/go/src/github.com/ligato/vpp-agent && make generate && make install' +if [ $? != 0 ]; then + echo "Failed to build vpp-agent in Docker image." + exit 1 +fi # Extract vpp-agent rm -rf agent mkdir -p agent @@ -153,12 +157,12 @@ DOCKER_IMAGE="$( readlink -f prod_vpp_agent.tar.gz | tr '\n' ' ' )" cd ${SCRIPT_DIR} -sudo apt-get -y update -sudo apt-get -y install libpython2.7-dev python-virtualenv - WORKING_TOPOLOGY="" export PYTHONPATH=${SCRIPT_DIR} +sudo apt-get -y update +sudo apt-get -y install libpython2.7-dev python-virtualenv + virtualenv --system-site-packages env . env/bin/activate @@ -197,7 +201,7 @@ function cancel_all { # packages trap "cancel_all ${WORKING_TOPOLOGY}" EXIT -python ${SCRIPT_DIR}/resources/tools/scripts/topo_container_copy.py\ +python ${SCRIPT_DIR}/resources/tools/scripts/topo_container_copy.py \ -t ${WORKING_TOPOLOGY} -d ${INSTALLATION_DIR} -i ${DOCKER_IMAGE} if [ $? -eq 0 ]; then echo "Docker image copied and loaded on hosts from: ${WORKING_TOPOLOGY}" @@ -206,235 +210,154 @@ else exit 1 fi +# Based on job we will identify DUT +if [[ ${JOB_NAME} == *hc2vpp* ]] ; +then + DUT="hc2vpp" +elif [[ ${JOB_NAME} == *vpp* ]] ; +then + DUT="vpp" +elif [[ ${JOB_NAME} == *ligato* ]] ; +then + DUT="kubernetes" +elif [[ ${JOB_NAME} == *dpdk* ]] ; +then + DUT="dpdk" +else + echo "Unable to identify dut type based on JOB_NAME variable: ${JOB_NAME}" + exit 1 +fi + +PYBOT_ARGS="--consolewidth 120 --loglevel TRACE --variable TOPOLOGY_PATH:${WORKING_TOPOLOGY} --suite tests.${DUT}.perf" + case "$TEST_TAG" in - # run specific performance tests based on jenkins job type variable + # select specific performance tests based on jenkins job type variable PERFTEST_DAILY ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include ndrdiscANDnic_intel-x520-da2AND1t1cORndrdiscANDnic_intel-x520-da2AND2t2c \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('ndrdiscANDnic_intel-x520-da2AND1t1c' + 'ndrdiscANDnic_intel-x520-da2AND2t2c' + 'ndrdiscAND1t1cANDipsec' + 'ndrdiscAND2t2cANDipsec') ;; PERFTEST_SEMI_WEEKLY ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include ndrdiscANDnic_intel-x710AND1t1cORndrdiscANDnic_intel-x710AND2t2cORndrdiscANDnic_intel-xl710AND1t1cORndrdiscANDnic_intel-xl710AND2t2c \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('ndrdiscANDnic_intel-x710AND1t1c' + 'ndrdiscANDnic_intel-x710AND2t2c' + 'ndrdiscANDnic_intel-xl710AND1t1c' + 'ndrdiscANDnic_intel-xl710AND2t2c') + ;; + PERFTEST_MRR_DAILY ) + TAGS=('mrrAND64bAND1t1c' + 'mrrAND64bAND2t2c' + 'mrrAND64bAND4t4c' + 'mrrAND78bAND1t1c' + 'mrrAND78bAND2t2c' + 'mrrAND78bAND4t4c' + 'mrrANDimixAND1t1cANDvhost' + 'mrrANDimixAND2t2cANDvhost' + 'mrrANDimixAND4t4cANDvhost' + 'mrrANDimixAND1t1cANDmemif' + 'mrrANDimixAND2t2cANDmemif' + 'mrrANDimixAND4t4cANDmemif') ;; VERIFY-PERF-NDRDISC ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include ndrdiscAND1t1cORndrdiscAND2t2c \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('ndrdiscAND1t1c' + 'ndrdiscAND2t2c') ;; VERIFY-PERF-PDRDISC ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include pdrdiscAND1t1cORpdrdiscAND2t2c \ - tests/ - RETURN_STATUS=$(echo $?) - ;; - VERIFY-PERF-NDRCHK ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include ndrchkAND1t1cORndrchkAND2t2c \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('pdrdiscAND1t1c' + 'pdrdiscAND2t2c') ;; - PERFTEST_NDRCHK_DAILY ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include ndrchkAND1t1cORndrchkAND2t2c \ - tests/ - RETURN_STATUS=$(echo $?) + VERIFY-PERF-MRR ) + TAGS=('mrrAND1t1c' + 'mrrAND2t2c') ;; VERIFY-PERF-IP4 ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include ndrdiscANDnic_intel-x520-da2AND1t1cANDip4baseORndrdiscANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDip4base' + 'mrrANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m') ;; VERIFY-PERF-IP6 ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include ndrdiscANDnic_intel-x520-da2AND1t1cANDip6baseORndrdiscANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDip6base' + 'mrrANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m') ;; VERIFY-PERF-L2 ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include ndrdiscANDnic_intel-x520-da2AND1t1cANDl2xcbaseORndrdiscANDnic_intel-x520-da2AND1t1cANDl2bdbase \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDl2xcbase' + 'mrrANDnic_intel-x520-da2AND1t1cANDl2bdbase') ;; VERIFY-PERF-LISP ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include ndrdiscANDnic_intel-x520-da2AND1t1cANDlisp \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('pdrchkANDnic_intel-x520-da2AND1t1cANDlisp') ;; VERIFY-PERF-VXLAN ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include ndrdiscANDnic_intel-x520-da2AND1t1cANDvxlan \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('pdrchkANDnic_intel-x520-da2AND1t1cANDvxlan') ;; VERIFY-PERF-VHOST ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include ndrdiscANDnic_intel-x520-da2AND1t1cANDvhost \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDvhost') + ;; + VERIFY-PERF-MEMIF ) + TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif' + 'pdrdiscANDnic_intel-x520-da2AND2t2cANDmemif' + 'mrrANDnic_intel-x520-da2AND1t1cANDmemif' + 'mrrANDnic_intel-x520-da2AND2t2cANDmemif') + ;; + VERIFY-PERF-IPSECHW ) + TAGS=('pdrdiscANDnic_intel-xl710AND1t1cANDipsechw' + 'pdrdiscANDnic_intel-xl710AND2t2cANDipsechw' + 'mrrANDnic_intel-xl710AND1t1cANDipsechw' + 'mrrANDnic_intel-xl710AND2t2cANDipsechw') ;; VPP-VERIFY-PERF-IP4 ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include pdrchkANDnic_intel-x520-da2AND1t1cANDip4baseORpdrchkANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDip4base' + 'mrrANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m') ;; VPP-VERIFY-PERF-IP6 ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include pdrchkANDnic_intel-x520-da2AND1t1cANDip6baseORpdrchkANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDip6base' + 'mrrANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m') ;; VPP-VERIFY-PERF-L2 ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include pdrchkANDnic_intel-x520-da2AND1t1cANDl2xcbaseORpdrchkANDnic_intel-x520-da2AND1t1cANDl2bdbase \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDl2xcbase' + 'mrrANDnic_intel-x520-da2AND1t1cANDl2bdbase') ;; VPP-VERIFY-PERF-LISP ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include pdrchkANDnic_intel-x520-da2AND1t1cANDlisp \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('pdrchkANDnic_intel-x520-da2AND1t1cANDlisp') ;; VPP-VERIFY-PERF-VXLAN ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include pdrchkANDnic_intel-x520-da2AND1t1cANDvxlan \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('pdrchkANDnic_intel-x520-da2AND1t1cANDvxlan') ;; VPP-VERIFY-PERF-VHOST ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include pdrdiscANDnic_intel-x520-da2AND1t1cANDvhost \ - tests/ - RETURN_STATUS=$(echo $?) - ;; - VPP-VERIFY-PERF-ACL ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include pdrdiscANDnic_intel-x520-da2AND1t1cANDacl \ - --include pdrdiscANDnic_intel-x520-da2AND2t2cANDacl \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDvhost') ;; - PERFTEST_LONG ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --exclude SKIP_PATCH \ - -i NDRPDRDISC \ - tests/ - RETURN_STATUS=$(echo $?) + VPP-VERIFY-PERF-MEMIF ) + TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif' + 'pdrdiscANDnic_intel-x520-da2AND2t2cANDmemif' + 'mrrANDnic_intel-x520-da2AND1t1cANDmemif' + 'mrrANDnic_intel-x520-da2AND2t2cANDmemif') ;; - PERFTEST_SHORT ) - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - -i NDRCHK \ - tests/ - RETURN_STATUS=$(echo $?) + VPP-VERIFY-PERF-ACL ) + TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDacl' + 'pdrdiscANDnic_intel-x520-da2AND2t2cANDacl') ;; - PERFTEST_NIGHTLY ) - #run all available tests - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - tests/ - RETURN_STATUS=$(echo $?) + VPP-VERIFY-PERF-IPSECHW ) + TAGS=('pdrdiscANDnic_intel-xl710AND1t1cANDipsechw' + 'pdrdiscANDnic_intel-xl710AND2t2cANDipsechw' + 'mrrANDnic_intel-xl710AND1t1cANDipsechw' + 'mrrANDnic_intel-xl710AND2t2cANDipsechw') ;; * ) - # run full performance test suite and exit on fail - pybot ${PYBOT_ARGS} \ - -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - tests/ - RETURN_STATUS=$(echo $?) + TAGS=('perftest') esac -# Pybot output post-processing -echo Post-processing test data... +# Catenate TAG selections by 'OR' +printf -v INCLUDES " --include %s " "${TAGS[@]}" -python ${SCRIPT_DIR}/resources/tools/scripts/robot_output_parser.py \ - -i ${SCRIPT_DIR}/output.xml \ - -o ${SCRIPT_DIR}/output_perf_data.xml \ - -v ${VPP_STABLE_VER} -if [ ! $? -eq 0 ]; then - echo "Parsing ${SCRIPT_DIR}/output.xml failed" -fi +# Execute the test +pybot ${PYBOT_ARGS}${INCLUDES} tests/ +RETURN_STATUS=$(echo $?) -# Archive artifacts -mkdir -p archive -for i in ${ARCHIVE_ARTIFACTS[@]}; do - cp $( readlink -f ${i} | tr '\n' ' ' ) archive/ +# Archive JOB artifacts in jenkins +for i in ${JOB_ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) ${JOB_ARCHIVE_DIR}/ +done +# Archive JOB artifacts to logs.fd.io +for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVE_DIR}/ done - -echo Post-processing finished. exit ${RETURN_STATUS}