X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf-ligato.sh;h=1ab881b6b37d4b2fc1ff708ae3de878b5cb63cbc;hp=0ede5901da6cfda5b0d5c89b1071d88804fc1a4f;hb=974d52d1976f802c99738712bbfe56e16d56d650;hpb=47b807e7268231b35982dc3b5a0c3108537d6432 diff --git a/bootstrap-verify-perf-ligato.sh b/bootstrap-verify-perf-ligato.sh index 0ede5901da..1ab881b6b3 100644 --- a/bootstrap-verify-perf-ligato.sh +++ b/bootstrap-verify-perf-ligato.sh @@ -15,9 +15,9 @@ 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} @@ -37,8 +37,8 @@ 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 -p vpp/build-root - cd vpp/build-root + mkdir -p vpp_download + cd vpp_download if [[ ${TEST_TAG} == *DAILY ]] || \ [[ ${TEST_TAG} == *WEEKLY ]]; @@ -56,50 +56,36 @@ then --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' )" - + VPP_DEBS="$( readlink -f vpp*.deb | tr '\n' ' ' )" cd ${SCRIPT_DIR} # If we run this script from vpp project we want to use local build elif [[ ${JOB_NAME} == vpp-* ]] ; then - mkdir -p vpp/build-root # 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' )" - # Move files to build-root for packing - for deb in ${VPP_DEBS}; do mv ${deb} vpp/build-root/; done 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 +dpkg -x vpp_download/vpp_*.deb /tmp/vpp -LIGATO_REPO_URL=$(cat ${SCRIPT_DIR}/LIGATO_REPO_URL) +LIGATO_REPO_URL='https://github.com/ligato/' VPP_AGENT_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_AGENT_STABLE_VER) 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 +cd .. && git clone -b ${VPP_AGENT_STABLE_VER} --single-branch \ + ${LIGATO_REPO_URL}/vpp-agent vpp-agent # If the git clone fails, complain clearly and exit 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_VER} -# If the git checkout fails, complain clearly and exit -if [ $? != 0 ]; then - echo "Failed to run: git checkout ${VPP_AGENT_STABLE_VER}" + echo "Failed to run: git clone ${LIGATO_REPO_URL}/vpp-agent" exit 1 fi +cd vpp-agent # Install Docker wget -q https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/${DOCKER_DEB} @@ -117,31 +103,30 @@ sudo docker tag ligato/dev-vpp-agent:${VPP_AGENT_STABLE_VER}\ # Start dev_vpp_agent container as daemon sudo docker run --rm -itd --name agentcnt dev_vpp_agent bash + # Copy latest vpp api into running container sudo docker cp /tmp/vpp/usr/share/vpp/api agentcnt:/usr/share/vpp +for f in ${SCRIPT_DIR}/vpp_download/*; do + sudo docker cp $f agentcnt:/opt/vpp-agent/dev/vpp/build-root/ +done + # Recompile vpp-agent sudo docker exec -i agentcnt \ - script -qec '. ~/.bashrc; cd /root/go/src/github.com/ligato/vpp-agent && make generate && make install' + script -qec '. ~/.bashrc; cd /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 -sudo docker cp agentcnt:/root/go/bin/vpp-agent agent/ -sudo docker cp agentcnt:/root/go/bin/vpp-agent-ctl agent/ -sudo docker cp agentcnt:/root/go/bin/agentctl agent/ -tar -zcvf ${SCRIPT_DIR}/../vpp-agent/docker/prod_vpp_agent/agent.tar.gz agent -# Kill running container -sudo docker rm -f agentcnt +# Save container state +sudo docker commit `sudo docker ps -q` dev_vpp_agent:latest # Build prod_vpp_agent docker image -cd ${SCRIPT_DIR}/../vpp-agent/docker/prod_vpp_agent/ &&\ - mv ${SCRIPT_DIR}/vpp.tar.gz . &&\ - sudo docker build -t prod_vpp_agent --no-cache . +cd docker/prod/ &&\ + sudo docker build --tag prod_vpp_agent --no-cache . # Export Docker image sudo docker save prod_vpp_agent | gzip > prod_vpp_agent.tar.gz +# Kill running agentcnt container +sudo docker rm -f agentcnt # If image build fails, complain clearly and exit if [ $? != 0 ]; then echo "Failed to build vpp-agent Docker image." @@ -162,6 +147,10 @@ virtualenv --system-site-packages env 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}; @@ -221,44 +210,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//:/ })