X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf-ligato.sh;h=91c74b4b888d0cf2d2b3a17d1f8728bccf2a26ec;hp=e3b130d3c274f8538ff99c24ef80b32976c14363;hb=173a910c5f56106cd5aaa620ae0f9cfb94fcfac3;hpb=5120b1082aa70f6e75511e9d95a2a7c303e25f9a diff --git a/bootstrap-verify-perf-ligato.sh b/bootstrap-verify-perf-ligato.sh index e3b130d3c2..91c74b4b88 100644 --- a/bootstrap-verify-perf-ligato.sh +++ b/bootstrap-verify-perf-ligato.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" @@ -41,31 +43,23 @@ then 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 - # Temporary disable using dpdk - # 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 + # Jenkins VPP deb paths (convert to full path) + 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_\(.*\)_amd64.deb' )" - # Temporary workaround as ligato docker file requires specific file name - rename -v 's/^(.*)-(\d.*)-deb.deb/$1_$2.deb/' *.deb cd ${SCRIPT_DIR} # If we run this script from vpp project we want to use local build @@ -158,7 +152,6 @@ DOCKER_IMAGE="$( readlink -f prod_vpp_agent.tar.gz | tr '\n' ' ' )" cd ${SCRIPT_DIR} WORKING_TOPOLOGY="" -export PYTHONPATH=${SCRIPT_DIR} sudo apt-get -y update sudo apt-get -y install libpython2.7-dev python-virtualenv @@ -228,44 +221,44 @@ 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' - 'ndrdiscAND1t1cANDipsec' - 'ndrdiscAND2t2cANDipsec') + TAGS=('ndrdiscANDnic_intel-x520-da2AND1c' + 'ndrdiscANDnic_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') + 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//:/ })