diff options
author | Peter Mikus <pmikus@cisco.com> | 2017-12-05 14:44:32 +0100 |
---|---|---|
committer | Peter Mikus <pmikus@cisco.com> | 2018-01-02 19:35:55 +0000 |
commit | 0437095f4bf958154f25a3f163f432b22fcdc743 (patch) | |
tree | 871a2170379e66dcb34b087dade9afcb9a74dd93 /bootstrap-verify-perf-ligato.sh | |
parent | d7cf0a829cc9cc63799330b673c8c42393de2655 (diff) |
CSIT-870 Kubernetes/Ligato integration
- Update overall Kubernetes/Ligato integration
- CSIT-871 Update infrastructure / images
- CSIT-872 Update of KubernetesUtils.py
Change-Id: I7833f56abd351c694d3d3e1c9c45e649aec892e1
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'bootstrap-verify-perf-ligato.sh')
-rw-r--r-- | bootstrap-verify-perf-ligato.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bootstrap-verify-perf-ligato.sh b/bootstrap-verify-perf-ligato.sh index 10470dc9ea..e11b5e77b3 100644 --- a/bootstrap-verify-perf-ligato.sh +++ b/bootstrap-verify-perf-ligato.sh @@ -88,7 +88,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 @@ -123,16 +123,15 @@ sudo docker images 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} |