X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf-ligato.sh;h=66549723521ac2f57351daaf31a303d2b8d1da8f;hp=f00183fe5a1cda20f0ed1df59159071ff2e0e6fe;hb=6e25bb5e8b8bcc2a1f741892508a68aec7d791b9;hpb=fcaf06abdd27a3a6ef18de14ce3d1dab2c75a8c9;ds=sidebyside diff --git a/bootstrap-verify-perf-ligato.sh b/bootstrap-verify-perf-ligato.sh index f00183fe5a..6654972352 100644 --- a/bootstrap-verify-perf-ligato.sh +++ b/bootstrap-verify-perf-ligato.sh @@ -62,6 +62,7 @@ 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} @@ -77,6 +78,7 @@ 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 @@ -88,7 +90,7 @@ 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.06.2~ce-0~ubuntu_amd64.deb" +DOCKER_DEB="docker-ce_17.09.0~ce-0~ubuntu_amd64.deb" # Clone & checkout stable vnf-agent cd .. && git clone ${LIGATO_REPO_URL}/vpp-agent @@ -119,20 +121,35 @@ 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 +# Copy latest vpp api into running container +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' +# 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 + # Build prod_vpp_agent docker image cd ${SCRIPT_DIR}/../vpp-agent/docker/prod_vpp_agent/ &&\ mv ${SCRIPT_DIR}/vpp.tar.gz . &&\ - ./extract_agent_files.sh &&\ - sudo docker build -t prod_vpp_agent --no-cache . &&\ - ./shrink.sh + sudo docker build -t prod_vpp_agent --no-cache . # Export Docker image -sudo docker save prod_vpp_agent_shrink | gzip > prod_vpp_agent_shrink.tar.gz +sudo docker save prod_vpp_agent | gzip > prod_vpp_agent.tar.gz # If image build fails, complain clearly and exit if [ $? != 0 ]; then echo "Failed to build vpp-agent Docker image." exit 1 fi -DOCKER_IMAGE="$( readlink -f prod_vpp_agent_shrink.tar.gz | tr '\n' ' ' )" +DOCKER_IMAGE="$( readlink -f prod_vpp_agent.tar.gz | tr '\n' ' ' )" cd ${SCRIPT_DIR} @@ -195,7 +212,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cORndrdiscANDnic_intel-x520-da2AND2t2c \ tests/ RETURN_STATUS=$(echo $?) @@ -204,7 +221,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscANDnic_intel-x710AND1t1cORndrdiscANDnic_intel-x710AND2t2cORndrdiscANDnic_intel-xl710AND1t1cORndrdiscANDnic_intel-xl710AND2t2c \ tests/ RETURN_STATUS=$(echo $?) @@ -213,7 +230,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscAND1t1cORndrdiscAND2t2c \ tests/ RETURN_STATUS=$(echo $?) @@ -222,7 +239,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include pdrdiscAND1t1cORpdrdiscAND2t2c \ tests/ RETURN_STATUS=$(echo $?) @@ -231,7 +248,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrchkAND1t1cORndrchkAND2t2c \ tests/ RETURN_STATUS=$(echo $?) @@ -240,7 +257,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrchkAND1t1cORndrchkAND2t2c \ tests/ RETURN_STATUS=$(echo $?) @@ -249,7 +266,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDip4baseORndrdiscANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) @@ -258,7 +275,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDip6baseORndrdiscANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) @@ -267,7 +284,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDl2xcbaseORndrdiscANDnic_intel-x520-da2AND1t1cANDl2bdbase \ tests/ RETURN_STATUS=$(echo $?) @@ -276,7 +293,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDlisp \ tests/ RETURN_STATUS=$(echo $?) @@ -285,7 +302,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDvxlan \ tests/ RETURN_STATUS=$(echo $?) @@ -294,7 +311,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include ndrdiscANDnic_intel-x520-da2AND1t1cANDvhost \ tests/ RETURN_STATUS=$(echo $?) @@ -303,7 +320,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include pdrchkANDnic_intel-x520-da2AND1t1cANDip4baseORpdrchkANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) @@ -312,7 +329,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include pdrchkANDnic_intel-x520-da2AND1t1cANDip6baseORpdrchkANDnic_intel-x520-da2AND1t1cANDip6fwdANDfib_2m \ tests/ RETURN_STATUS=$(echo $?) @@ -321,7 +338,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include pdrchkANDnic_intel-x520-da2AND1t1cANDl2xcbaseORpdrchkANDnic_intel-x520-da2AND1t1cANDl2bdbase \ tests/ RETURN_STATUS=$(echo $?) @@ -330,7 +347,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include pdrchkANDnic_intel-x520-da2AND1t1cANDlisp \ tests/ RETURN_STATUS=$(echo $?) @@ -339,7 +356,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include pdrchkANDnic_intel-x520-da2AND1t1cANDvxlan \ tests/ RETURN_STATUS=$(echo $?) @@ -348,7 +365,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include pdrdiscANDnic_intel-x520-da2AND1t1cANDvhost \ tests/ RETURN_STATUS=$(echo $?) @@ -357,7 +374,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --include pdrdiscANDnic_intel-x520-da2AND1t1cANDacl \ --include pdrdiscANDnic_intel-x520-da2AND2t2cANDacl \ tests/ @@ -367,7 +384,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ --exclude SKIP_PATCH \ -i NDRPDRDISC \ tests/ @@ -377,7 +394,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ -i NDRCHK \ tests/ RETURN_STATUS=$(echo $?) @@ -387,7 +404,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ tests/ RETURN_STATUS=$(echo $?) ;; @@ -396,7 +413,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -v DPDK_TEST:True \ - -s "tests.ligato.perf" \ + -s "tests.kubernetes.perf" \ tests/ RETURN_STATUS=$(echo $?) esac