X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf-ligato.sh;h=44ebd8d9f38b30a97d1ac7ca6e4c26b8ad5d6fbc;hp=66549723521ac2f57351daaf31a303d2b8d1da8f;hb=bb81ef05b86154d000128ef15bd3ecffe997ef9a;hpb=6e25bb5e8b8bcc2a1f741892508a68aec7d791b9 diff --git a/bootstrap-verify-perf-ligato.sh b/bootstrap-verify-perf-ligato.sh index 6654972352..44ebd8d9f3 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: @@ -27,7 +27,12 @@ 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 +40,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 +66,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 +81,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 +102,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 tags/${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 +122,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 +129,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 +159,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 +203,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,67 +212,90 @@ 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 + case "$TEST_TAG" in # run 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" \ + -s "tests.${DUT}.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cORndrdiscANDnic_intel-x520-da2AND2t2c \ + --include ndrdiscAND1t1cANDipsecORndrdiscAND2t2cANDipsec \ tests/ RETURN_STATUS=$(echo $?) ;; PERFTEST_SEMI_WEEKLY ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ + -s "tests.${DUT}.perf" \ --include ndrdiscANDnic_intel-x710AND1t1cORndrdiscANDnic_intel-x710AND2t2cORndrdiscANDnic_intel-xl710AND1t1cORndrdiscANDnic_intel-xl710AND2t2c \ tests/ RETURN_STATUS=$(echo $?) ;; - VERIFY-PERF-NDRDISC ) + PERFTEST_MRR_DAILY ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include ndrdiscAND1t1cORndrdiscAND2t2c \ + -s "tests.${DUT}.perf" \ + --include mrrAND64bAND1t1c \ + --include mrrAND64bAND2t2c \ + --include mrrAND64bAND4t4c \ + --include mrrAND78bAND1t1c \ + --include mrrAND78bAND2t2c \ + --include mrrAND78bAND4t4c \ + --include mrrANDimixAND1t1cANDvhost \ + --include mrrANDimixAND2t2cANDvhost \ + --include mrrANDimixAND4t4cANDvhost \ + --include mrrANDimixAND1t1cANDmemif \ + --include mrrANDimixAND2t2cANDmemif \ + --include mrrANDimixAND4t4cANDmemif \ tests/ RETURN_STATUS=$(echo $?) ;; - VERIFY-PERF-PDRDISC ) + VERIFY-PERF-NDRDISC ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include pdrdiscAND1t1cORpdrdiscAND2t2c \ + -s "tests.${DUT}.perf" \ + --include ndrdiscAND1t1cORndrdiscAND2t2c \ tests/ RETURN_STATUS=$(echo $?) ;; - VERIFY-PERF-NDRCHK ) + VERIFY-PERF-PDRDISC ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include ndrchkAND1t1cORndrchkAND2t2c \ + -s "tests.${DUT}.perf" \ + --include pdrdiscAND1t1cORpdrdiscAND2t2c \ tests/ RETURN_STATUS=$(echo $?) ;; - PERFTEST_NDRCHK_DAILY ) + VERIFY-PERF-MRR ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - --include ndrchkAND1t1cORndrchkAND2t2c \ + -s "tests.${DUT}.perf" \ + --include mrrAND1t1cORmrrAND2t2c \ tests/ RETURN_STATUS=$(echo $?) ;; VERIFY-PERF-IP4 ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ + -s "tests.${DUT}.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDip4baseORndrdiscANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) @@ -274,8 +303,7 @@ case "$TEST_TAG" in VERIFY-PERF-IP6 ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ + -s "tests.${DUT}.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDip6baseORndrdiscANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) @@ -283,8 +311,7 @@ case "$TEST_TAG" in VERIFY-PERF-L2 ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ + -s "tests.${DUT}.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDl2xcbaseORndrdiscANDnic_intel-x520-da2AND1t1cANDl2bdbase \ tests/ RETURN_STATUS=$(echo $?) @@ -292,8 +319,7 @@ case "$TEST_TAG" in VERIFY-PERF-LISP ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ + -s "tests.${DUT}.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDlisp \ tests/ RETURN_STATUS=$(echo $?) @@ -301,8 +327,7 @@ case "$TEST_TAG" in VERIFY-PERF-VXLAN ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ + -s "tests.${DUT}.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDvxlan \ tests/ RETURN_STATUS=$(echo $?) @@ -310,44 +335,58 @@ case "$TEST_TAG" in VERIFY-PERF-VHOST ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ + -s "tests.${DUT}.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDvhost \ tests/ RETURN_STATUS=$(echo $?) ;; + VERIFY-PERF-MEMIF ) + pybot ${PYBOT_ARGS} \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.${DUT}.perf" \ + --include ndrdiscANDnic_intel-x520-da2AND1t1cANDmemif \ + tests/ + RETURN_STATUS=$(echo $?) + ;; + VERIFY-PERF-IPSECHW ) + pybot ${PYBOT_ARGS} \ + -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.${DUT}.perf.crypto" \ + --include ndrdiscANDnic_intel-xl710AND1t1cANDipsechw \ + --include ndrdiscANDnic_intel-xl710AND2t2cANDipsechw \ + --include mrrANDnic_intel-xl710AND1t1cANDipsechw \ + --include mrrANDnic_intel-xl710AND2t2cANDipsechw \ + tests/ + RETURN_STATUS=$(echo $?) + ;; 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 \ + -s "tests.${DUT}.perf" \ + --include mrrANDnic_intel-x520-da2AND1t1cANDip4baseORmrrANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) ;; 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 \ + -s "tests.${DUT}.perf" \ + --include mrrANDnic_intel-x520-da2AND1t1cANDip6baseORmrrANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) ;; 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 \ + -s "tests.${DUT}.perf" \ + --include mrrANDnic_intel-x520-da2AND1t1cANDl2xcbaseORmrrANDnic_intel-x520-da2AND1t1cANDl2bdbase \ tests/ RETURN_STATUS=$(echo $?) ;; VPP-VERIFY-PERF-LISP ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ + -s "tests.${DUT}.perf" \ --include pdrchkANDnic_intel-x520-da2AND1t1cANDlisp \ tests/ RETURN_STATUS=$(echo $?) @@ -355,8 +394,7 @@ case "$TEST_TAG" in VPP-VERIFY-PERF-VXLAN ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ + -s "tests.${DUT}.perf" \ --include pdrchkANDnic_intel-x520-da2AND1t1cANDvxlan \ tests/ RETURN_STATUS=$(echo $?) @@ -364,47 +402,39 @@ case "$TEST_TAG" in VPP-VERIFY-PERF-VHOST ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ + -s "tests.${DUT}.perf" \ --include pdrdiscANDnic_intel-x520-da2AND1t1cANDvhost \ tests/ RETURN_STATUS=$(echo $?) ;; - VPP-VERIFY-PERF-ACL ) + VPP-VERIFY-PERF-MEMIF ) 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 \ + -s "tests.${DUT}.perf" \ + --include pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif \ + --include pdrdiscANDnic_intel-x520-da2AND2t2cANDmemif \ + --include mrrANDnic_intel-x520-da2AND1t1cANDmemif \ + --include mrrANDnic_intel-x520-da2AND2t2cANDmemif \ tests/ RETURN_STATUS=$(echo $?) ;; - 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 $?) - ;; - PERFTEST_SHORT ) + VPP-VERIFY-PERF-ACL ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ - -i NDRCHK \ + -s "tests.${DUT}.perf" \ + --include pdrdiscANDnic_intel-x520-da2AND1t1cANDacl \ + --include pdrdiscANDnic_intel-x520-da2AND2t2cANDacl \ tests/ RETURN_STATUS=$(echo $?) ;; - PERFTEST_NIGHTLY ) - #run all available tests + VPP-VERIFY-PERF-IPSECHW ) pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -v DPDK_TEST:True \ - -s "tests.kubernetes.perf" \ + -s "tests.${DUT}.perf.crypto" \ + --include pdrdiscANDnic_intel-xl710AND1t1cANDipsechw \ + --include pdrdiscANDnic_intel-xl710AND2t2cANDipsechw \ + --include mrrANDnic_intel-xl710AND1t1cANDipsechw \ + --include mrrANDnic_intel-xl710AND2t2cANDipsechw \ tests/ RETURN_STATUS=$(echo $?) ;; @@ -412,29 +442,18 @@ case "$TEST_TAG" in # 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" \ + -s "tests.${DUT}.perf" \ tests/ RETURN_STATUS=$(echo $?) esac -# Pybot output post-processing -echo Post-processing test data... - -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 - -# 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}