diff options
author | Peter Mikus <pmikus@cisco.com> | 2018-06-15 08:22:27 +0000 |
---|---|---|
committer | Peter Mikus <pmikus@cisco.com> | 2018-07-12 04:43:06 +0000 |
commit | 2f163225dbdf4969394695aa0b9af3bbf9a34015 (patch) | |
tree | 76ee4946793db9b237c11ebd05be00df8aa6fd5a | |
parent | ad27739cd87a75b172fd415fc20db08983ea4e13 (diff) |
Update Ligato to latest dev branch
- Due to heavy modifications on vpp-agent docker images we need
to change build mechanics.
Change-Id: I26fb82ed1b2538335f7dc3dbb7f46ed2bb846583
Signed-off-by: Peter Mikus <pmikus@cisco.com>
-rw-r--r-- | LIGATO_REPO_URL | 1 | ||||
-rw-r--r-- | bootstrap-verify-perf-ligato.sh | 57 |
2 files changed, 21 insertions, 37 deletions
diff --git a/LIGATO_REPO_URL b/LIGATO_REPO_URL deleted file mode 100644 index 6b4ed1d7d8..0000000000 --- a/LIGATO_REPO_URL +++ /dev/null @@ -1 +0,0 @@ -https://github.com/ligato/ diff --git a/bootstrap-verify-perf-ligato.sh b/bootstrap-verify-perf-ligato.sh index 91c74b4b88..b704bfd32e 100644 --- a/bootstrap-verify-perf-ligato.sh +++ b/bootstrap-verify-perf-ligato.sh @@ -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." |