X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf.sh;h=9e1d43ac70a7f8163782548d3f74df0e327633ee;hp=56e603709086b5784b07f46711bafb0ea640a12d;hb=faadf83599b8640c9235c38a4ab57c7adfb9eb96;hpb=fe757aee086b669ab042a9216f7e01a2d9a7ffcb diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index 56e6037090..9e1d43ac70 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -14,19 +14,26 @@ set -xo pipefail +# TOPOLOGY # Space separated list of available testbeds, described by topology files -TOPOLOGIES="topologies/available/lf_3n_hsw_testbed1.yaml \ - topologies/available/lf_3n_hsw_testbed2.yaml \ - topologies/available/lf_3n_hsw_testbed3.yaml" - +TOPOLOGIES_3N_HSW="topologies/available/lf_3n_hsw_testbed1.yaml \ + topologies/available/lf_3n_hsw_testbed2.yaml \ + topologies/available/lf_3n_hsw_testbed3.yaml" +TOPOLOGIES_2N_SKX="topologies/available/lf_2n_skx_testbed21.yaml \ + topologies/available/lf_2n_skx_testbed24.yaml" +TOPOLOGIES_3N_SKX="topologies/available/lf_3n_skx_testbed31.yaml \ + topologies/available/lf_3n_skx_testbed32.yaml" + +# SYSTEM SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export PYTHONPATH=${SCRIPT_DIR} export DEBIAN_FRONTEND=noninteractive -# Reservation dir +# RESERVATION RESERVATION_DIR="/tmp/reservation_dir" INSTALLATION_DIR="/tmp/install_dir" +# ARCHIVE JOB_ARCHIVE_ARTIFACTS=(log.html output.xml report.html) LOG_ARCHIVE_ARTIFACTS=(log.html output.xml report.html) JOB_ARCHIVE_DIR="archive" @@ -34,49 +41,79 @@ 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-* ]] ; -then - if [[ ${TEST_TAG} == *DAILY ]] || \ - [[ ${TEST_TAG} == *WEEKLY ]]; - then - echo Downloading latest VPP packages from NEXUS... - bash ${SCRIPT_DIR}/resources/tools/scripts/download_install_vpp_pkgs.sh \ - --skip-install - else - 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) - #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 - # 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-* ]] ; -then - # Use local packages provided as argument list - # Jenkins VPP deb paths (convert to full path) - VPP_DEBS="$( readlink -f $@ | tr '\n' ' ' )" -else - echo "Unable to identify job type based on JOB_NAME variable: ${JOB_NAME}" - exit 1 -fi - -WORKING_TOPOLOGY="" - -sudo apt-get -y update -sudo apt-get -y install libpython2.7-dev python-virtualenv +# JOB SETTING +case ${JOB_NAME} in + *2n-skx*) + TOPOLOGIES=$TOPOLOGIES_2N_SKX + TOPOLOGIES_TAGS="2_node_*_link_topo" + ;; + *3n-skx*) + TOPOLOGIES=$TOPOLOGIES_3N_SKX + TOPOLOGIES_TAGS="3_node_*_link_topo" + ;; + *) + TOPOLOGIES=$TOPOLOGIES_3N_HSW + TOPOLOGIES_TAGS="3_node_*_link_topo" + ;; +esac +case ${JOB_NAME} in + *hc2vpp*) + DUT="hc2vpp" + ;; + *vpp*) + DUT="vpp" + + case ${JOB_NAME} in + csit-vpp-*) + # Use downloaded packages with specific version + if [[ ${TEST_TAG} == *DAILY ]] || \ + [[ ${TEST_TAG} == *WEEKLY ]]; + then + echo Downloading latest VPP packages from NEXUS... + bash ${SCRIPT_DIR}/resources/tools/scripts/download_install_vpp_pkgs.sh \ + --skip-install + else + 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) + bash ${SCRIPT_DIR}/resources/tools/scripts/download_install_vpp_pkgs.sh \ + --skip-install --vpp ${VPP_STABLE_VER} --dkms ${DPDK_STABLE_VER} + fi + # Jenkins VPP deb paths (convert to full path) + DUT_PKGS="$( readlink -f ${DUT}*.deb | tr '\n' ' ' )" + ;; + vpp-csit-*) + # Use local packages provided as argument list + # Jenkins VPP deb paths (convert to full path) + DUT_PKGS="$( readlink -f $@ | tr '\n' ' ' )" + ;; + *) + echo "Unable to identify job type based on JOB_NAME variable: ${JOB_NAME}" + exit 1 + ;; + esac + ;; + *ligato*) + DUT="kubernetes" + ;; + *dpdk*) + DUT="dpdk" + ;; + *) + echo "Unable to identify dut type based on JOB_NAME variable: ${JOB_NAME}" + exit 1 + ;; +esac +# ENVIRONMENT PREPARATION virtualenv --system-site-packages env . env/bin/activate - -echo pip install pip install -r requirements.txt +if [ -z "${TOPOLOGIES}" ]; then + echo "No applicable topology found!" + exit 1 +fi # We iterate over available topologies and wait until we reserve topology while :; do for TOPOLOGY in ${TOPOLOGIES}; @@ -110,167 +147,58 @@ function cancel_all { trap "cancel_all ${WORKING_TOPOLOGY}" EXIT python ${SCRIPT_DIR}/resources/tools/scripts/topo_installation.py \ - -t ${WORKING_TOPOLOGY} -d ${INSTALLATION_DIR} -p ${VPP_DEBS} + -t ${WORKING_TOPOLOGY} -d ${INSTALLATION_DIR} -p ${DUT_PKGS} if [ $? -eq 0 ]; then - echo "VPP Installed on hosts from: ${WORKING_TOPOLOGY}" -else - echo "Failed to copy vpp deb files to DUTs" - 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" + echo "DUT installed on hosts from: ${WORKING_TOPOLOGY}" else - echo "Unable to identify dut type based on JOB_NAME variable: ${JOB_NAME}" + echo "Failed to copy DUT packages files to hosts from: ${WORKING_TOPOLOGY}" exit 1 fi -PYBOT_ARGS="--consolewidth 120 --loglevel TRACE --variable TOPOLOGY_PATH:${WORKING_TOPOLOGY} --suite tests.${DUT}.perf" +# CSIT EXECUTION +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' - '!lbond_dpdk') - ;; - VERIFY-PERF-LISP ) - TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDlisp') - ;; - VERIFY-PERF-VXLAN ) - TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvxlan') - ;; - VERIFY-PERF-VHOST ) - TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvhost' - '!lbond_dpdk') - ;; - 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') - ;; - VERIFY-PERF-SRV6 ) - TAGS=('mrrANDsrv6AND1t1c' - 'mrrANDsrv6AND2t2c') - ;; - 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' - 'mrrANDnic_intel-x520-da2AND1t1cANDdot1q' - '!lbond_dpdk') - ;; - VPP-VERIFY-PERF-LISP ) - TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDlisp') - ;; - VPP-VERIFY-PERF-VXLAN ) - TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvxlan') - ;; - VPP-VERIFY-PERF-VHOST ) - TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvhost' - '!lbond_dpdk') - ;; - 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=('mrrANDnic_intel-x520-da2AND1t1cANDacl' - 'mrrANDnic_intel-x520-da2AND2t2cANDacl') - ;; - VPP-VERIFY-PERF-IPSECHW ) - TAGS=('pdrdiscANDnic_intel-xl710AND1t1cANDipsechw' - 'pdrdiscANDnic_intel-xl710AND2t2cANDipsechw' - 'mrrANDnic_intel-xl710AND1t1cANDipsechw' - 'mrrANDnic_intel-xl710AND2t2cANDipsechw') - ;; - VPP-VERIFY-PERF-SRV6 ) - TAGS=('mrrANDsrv6AND1t1c' - 'mrrANDsrv6AND2t2c') + 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-x710AND1t1cAND64bANDip4base' - 'mrrANDnic_intel-x710AND1t1cAND78bANDip6base' - 'mrrANDnic_intel-x710AND1t1cAND64bANDl2bdbase') + 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//:/ }) @@ -305,7 +233,7 @@ for TAG in "${TAGS[@]}"; do if [[ ${TAG} == "!"* ]]; then EXPANDED_TAGS+=(" --exclude ${TAG#$"!"} ") else - EXPANDED_TAGS+=(" --include ${TAG} ") + EXPANDED_TAGS+=(" --include ${TOPOLOGIES_TAGS}AND${TAG} ") fi done