X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf.sh;h=74f629f59a234e4e6880410c8b1e9b236523ce1f;hp=667c1d0691242cac9a6422f1f42845d6cfad9cd9;hb=173a910c5f56106cd5aaa620ae0f9cfb94fcfac3;hpb=dbf2d4e05ccdfcb851eb2737659fffdbb42ed1ea diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index 667c1d0691..74f629f59a 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -15,11 +15,13 @@ set -xo pipefail # Space separated list of available testbeds, described by topology files -TOPOLOGIES="topologies/available/lf_testbed1.yaml \ - topologies/available/lf_testbed2.yaml \ - topologies/available/lf_testbed3.yaml" +TOPOLOGIES="topologies/available/lf_3n_hsw_testbed1.yaml \ + topologies/available/lf_3n_hsw_testbed2.yaml \ + topologies/available/lf_3n_hsw_testbed3.yaml" SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +export PYTHONPATH=${SCRIPT_DIR} +export DEBIAN_FRONTEND=noninteractive # Reservation dir RESERVATION_DIR="/tmp/reservation_dir" @@ -35,35 +37,23 @@ mkdir -p ${LOG_ARCHIVE_DIR} # If we run this script from CSIT jobs we want to use stable vpp version if [[ ${JOB_NAME} == csit-* ]] ; then - mkdir vpp_download - cd vpp_download - if [[ ${TEST_TAG} == *DAILY ]] || \ [[ ${TEST_TAG} == *WEEKLY ]]; then - # Download the latest VPP build .deb install packages - echo Downloading VPP packages... - bash ${SCRIPT_DIR}/resources/tools/scripts/download_install_vpp_pkgs.sh --skip-install - - VPP_DEBS="$( readlink -f *.deb | tr '\n' ' ' )" - # Take vpp package and get the vpp version - VPP_STABLE_VER="$( expr match $(ls *.deb | head -n 1) 'vpp-\(.*\)-deb.deb' )" + echo Downloading latest VPP packages from NEXUS... + bash ${SCRIPT_DIR}/resources/tools/scripts/download_install_vpp_pkgs.sh \ + --skip-install else - DPDK_STABLE_VER=$(cat ${SCRIPT_DIR}/DPDK_STABLE_VER)_amd64 - VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_REPO_URL_UBUNTU) + echo Downloading VPP packages of specific version from NEXUS... + DPDK_STABLE_VER=$(cat ${SCRIPT_DIR}/DPDK_STABLE_VER) VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_STABLE_VER_UBUNTU) - VPP_CLASSIFIER="-deb" - # Download vpp build from nexus and set VPP_DEBS variable - wget -q "${VPP_REPO_URL}/vpp/${VPP_STABLE_VER}/vpp-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit - wget -q "${VPP_REPO_URL}/vpp-dbg/${VPP_STABLE_VER}/vpp-dbg-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit - wget -q "${VPP_REPO_URL}/vpp-dev/${VPP_STABLE_VER}/vpp-dev-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit - wget -q "${VPP_REPO_URL}/vpp-dpdk-dkms/${DPDK_STABLE_VER}/vpp-dpdk-dkms-${DPDK_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit - wget -q "${VPP_REPO_URL}/vpp-lib/${VPP_STABLE_VER}/vpp-lib-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit - wget -q "${VPP_REPO_URL}/vpp-plugins/${VPP_STABLE_VER}/vpp-plugins-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit - VPP_DEBS="$( readlink -f *.deb | tr '\n' ' ' )" + #Temporary if arch will not be removed from VPP_STABLE_VER_UBUNTU + #VPP_STABLE_VER=${VPP_STABLE_VER%_amd64} + bash ${SCRIPT_DIR}/resources/tools/scripts/download_install_vpp_pkgs.sh \ + --skip-install --vpp ${VPP_STABLE_VER} --dkms ${DPDK_STABLE_VER} fi - - cd ${SCRIPT_DIR} + # Jenkins VPP deb paths (convert to full path) + VPP_DEBS="$( readlink -f vpp*.deb | tr '\n' ' ' )" # If we run this script from vpp project we want to use local build elif [[ ${JOB_NAME} == vpp-* ]] ; @@ -71,15 +61,12 @@ then # Use local packages provided as argument list # Jenkins VPP deb paths (convert to full path) VPP_DEBS="$( readlink -f $@ | tr '\n' ' ' )" - # Take vpp package and get the vpp version - VPP_STABLE_VER="$( expr match $1 'vpp-\(.*\)-deb.deb' )" else echo "Unable to identify job type based on JOB_NAME variable: ${JOB_NAME}" exit 1 fi WORKING_TOPOLOGY="" -export PYTHONPATH=${SCRIPT_DIR} sudo apt-get -y update sudo apt-get -y install libpython2.7-dev python-virtualenv @@ -149,129 +136,86 @@ else exit 1 fi -PYBOT_ARGS="--consolewidth 120 --loglevel TRACE --variable TOPOLOGY_PATH:${WORKING_TOPOLOGY} --suite tests.${DUT}.perf" +PYBOT_ARGS="--consolewidth 100 --loglevel TRACE --variable TOPOLOGY_PATH:${WORKING_TOPOLOGY} --suite tests.${DUT}.perf" case "$TEST_TAG" in # select specific performance tests based on jenkins job type variable PERFTEST_DAILY ) - TAGS=('ndrdiscANDnic_intel-x520-da2AND1t1c' - 'ndrdiscANDnic_intel-x520-da2AND2t2c' - 'ndrpdrANDnic_intel-x520-da2AND1t1c' - 'ndrpdrANDnic_intel-x520-da2AND2t2c' - 'ndrdiscAND1t1cANDipsec' - 'ndrdiscAND2t2cANDipsec') + TAGS=('ndrdiscANDnic_intel-x520-da2AND1c' + 'ndrdiscANDnic_intel-x520-da2AND2c' + 'ndrpdrANDnic_intel-x520-da2AND1c' + 'ndrpdrANDnic_intel-x520-da2AND2c' + 'ndrdiscAND1cANDipsec' + 'ndrdiscAND2cANDipsec') ;; PERFTEST_SEMI_WEEKLY ) - TAGS=('ndrdiscANDnic_intel-x710AND1t1c' - 'ndrdiscANDnic_intel-x710AND2t2c' - 'ndrdiscANDnic_intel-xl710AND1t1c' - 'ndrdiscANDnic_intel-xl710AND2t2c') + TAGS=('ndrdiscANDnic_intel-x710AND1c' + 'ndrdiscANDnic_intel-x710AND2c' + 'ndrdiscANDnic_intel-xl710AND1c' + 'ndrdiscANDnic_intel-xl710AND2c') ;; PERFTEST_MRR_DAILY ) - TAGS=('mrrAND64bAND1t1c' - 'mrrAND64bAND2t2c' - 'mrrAND64bAND4t4c' - 'mrrAND78bAND1t1c' - 'mrrAND78bAND2t2c' - 'mrrAND78bAND4t4c' - 'mrrANDimixAND1t1cANDvhost' - 'mrrANDimixAND2t2cANDvhost' - 'mrrANDimixAND4t4cANDvhost' - 'mrrANDimixAND1t1cANDmemif' - 'mrrANDimixAND2t2cANDmemif' - 'mrrANDimixAND4t4cANDmemif') - ;; - VERIFY-PERF-NDRDISC ) - TAGS=('ndrdiscAND1t1c' - 'ndrdiscAND2t2c') - ;; - VERIFY-PERF-PDRDISC ) - TAGS=('pdrdiscAND1t1c' - 'pdrdiscAND2t2c') - ;; - VERIFY-PERF-MRR ) - TAGS=('mrrAND1t1c' - 'mrrAND2t2c') - ;; - VERIFY-PERF-IP4 ) - TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDip4base' - 'mrrANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m') - ;; - VERIFY-PERF-IP6 ) - TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDip6base' - 'mrrANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m') - ;; - VERIFY-PERF-L2 ) - TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDl2xcbase' - 'mrrANDnic_intel-x520-da2AND1t1cANDl2bdbase') - ;; - VERIFY-PERF-LISP ) - TAGS=('pdrchkANDnic_intel-x520-da2AND1t1cANDlisp') - ;; - VERIFY-PERF-VXLAN ) - TAGS=('pdrchkANDnic_intel-x520-da2AND1t1cANDvxlan') - ;; - VERIFY-PERF-VHOST ) - 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 ) - TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDip4base' - 'mrrANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m') - ;; - VPP-VERIFY-PERF-IP6 ) - TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDip6base' - 'mrrANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m') - ;; - VPP-VERIFY-PERF-L2 ) - TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDl2xcbase' - 'mrrANDnic_intel-x520-da2AND1t1cANDl2bdbase') - ;; - VPP-VERIFY-PERF-LISP ) - TAGS=('pdrchkANDnic_intel-x520-da2AND1t1cANDlisp') - ;; - VPP-VERIFY-PERF-VXLAN ) - TAGS=('pdrchkANDnic_intel-x520-da2AND1t1cANDvxlan') - ;; - VPP-VERIFY-PERF-VHOST ) - TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDvhost') - ;; - VPP-VERIFY-PERF-MEMIF ) - TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif' - 'pdrdiscANDnic_intel-x520-da2AND2t2cANDmemif' - 'mrrANDnic_intel-x520-da2AND1t1cANDmemif' - 'mrrANDnic_intel-x520-da2AND2t2cANDmemif') - ;; - VPP-VERIFY-PERF-ACL ) - TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDacl' - 'pdrdiscANDnic_intel-x520-da2AND2t2cANDacl') - ;; - VPP-VERIFY-PERF-IPSECHW ) - TAGS=('pdrdiscANDnic_intel-xl710AND1t1cANDipsechw' - 'pdrdiscANDnic_intel-xl710AND2t2cANDipsechw' - 'mrrANDnic_intel-xl710AND1t1cANDipsechw' - 'mrrANDnic_intel-xl710AND2t2cANDipsechw') + TAGS=('mrrAND64bAND1c' + 'mrrAND64bAND2c' + 'mrrAND64bAND4c' + 'mrrAND78bAND1c' + 'mrrAND78bAND2c' + 'mrrAND78bAND4c' + 'mrrANDimixAND1cANDvhost' + 'mrrANDimixAND2cANDvhost' + 'mrrANDimixAND4cANDvhost' + 'mrrANDimixAND1cANDmemif' + 'mrrANDimixAND2cANDmemif' + 'mrrANDimixAND4cANDmemif') + ;; + VERIFY-PERF-PATCH ) + if [[ -z "$TEST_TAG_STRING" ]]; then + # If nothing is specified, we will run pre-selected tests by + # following tags. Items of array will be concatenated by OR in Robot + # Framework. + TEST_TAG_ARRAY=('mrrANDnic_intel-x710AND1cAND64bANDip4base' + 'mrrANDnic_intel-x710AND1cAND78bANDip6base' + 'mrrANDnic_intel-x710AND1cAND64bANDl2bdbase') + else + # If trigger contains tags, split them into array. + TEST_TAG_ARRAY=(${TEST_TAG_STRING//:/ }) + fi + + TAGS=() + + for TAG in "${TEST_TAG_ARRAY[@]}"; do + if [[ ${TAG} == "!"* ]]; then + # Exclude tags are not prefixed. + TAGS+=("${TAG}") + else + # We will prefix with perftest to prevent running other tests + # (e.g. Functional). + prefix="perftestAND" + if [[ ${JOB_NAME} == vpp-* ]] ; then + # Automatic prefixing for VPP jobs to limit the NIC used and + # traffic evaluation to MRR. + prefix="${prefix}mrrANDnic_intel-x710AND" + fi + TAGS+=("$prefix${TAG}") + fi + done ;; * ) TAGS=('perftest') esac -# Catenate TAG selections by 'OR' -printf -v INCLUDES " --include %s " "${TAGS[@]}" +# Catenate TAG selections +EXPANDED_TAGS=() +for TAG in "${TAGS[@]}"; do + if [[ ${TAG} == "!"* ]]; then + EXPANDED_TAGS+=(" --exclude ${TAG#$"!"} ") + else + EXPANDED_TAGS+=(" --include ${TAG} ") + fi +done # Execute the test -pybot ${PYBOT_ARGS}${INCLUDES} tests/ +pybot ${PYBOT_ARGS}${EXPANDED_TAGS[@]} tests/ RETURN_STATUS=$(echo $?) # Archive JOB artifacts in jenkins @@ -283,4 +227,4 @@ for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVE_DIR}/ done -exit ${RETURN_STATUS} \ No newline at end of file +exit ${RETURN_STATUS}