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}
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
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
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}
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 $?)
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 $?)
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 $?)
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 $?)
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 $?)
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 $?)
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 $?)
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 $?)
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 $?)
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 $?)
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 $?)
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 $?)
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 $?)
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 $?)
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 $?)
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 $?)
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 $?)
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 $?)
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/
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/
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 $?)
pybot ${PYBOT_ARGS} \
-v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-v DPDK_TEST:True \
- -s "tests.ligato.perf" \
+ -s "tests.kubernetes.perf" \
tests/
RETURN_STATUS=$(echo $?)
;;
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