From f04f64e8b3052dd18875d2255f102bc972f0a04b Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Tue, 21 Jun 2016 02:44:52 +0800 Subject: [PATCH] Fix wget failures in fuel@opnfv Change-Id: Ie95dc77f267a385adfe87cb32952d8861a515934 Signed-off-by: Guo Ruijing --- deployment_scripts/install.sh | 4 ++-- pre_build_hook | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/deployment_scripts/install.sh b/deployment_scripts/install.sh index 47a40a8..8d20628 100644 --- a/deployment_scripts/install.sh +++ b/deployment_scripts/install.sh @@ -12,7 +12,7 @@ dpdk=$3 if [ $nsh = 'true' ] then - wget -r -np -nH --cut-dirs=3 http://$host:8080/plugins/fuel-plugin-ovs-0.9/ovs-nsh/ + curl http://$host:8080/plugins/fuel-plugin-ovs-0.9/repositories/ubuntu/ovs-nsh-dpdk.tar.gz | tar -xzv dpkg -i openvswitch-datapath-dkms_2.5.90-1.nsh_all.deb dpkg -i openvswitch-common_2.5.90-1.nsh_amd64.deb dpkg -i openvswitch-switch_2.5.90-1.nsh_amd64.deb @@ -25,7 +25,7 @@ then dpkg -i openvswitch-switch-dpdk_2.5.90-1.nsh_amd64.deb fi else - wget -r -np -nH --cut-dirs=3 http://$host:8080/plugins/fuel-plugin-ovs-0.9/ovs-dpdk/ + curl http://$host:8080/plugins/fuel-plugin-ovs-0.9/repositories/ubuntu/ovs-dpdk.tar.gz | tar -xzv dpkg -i openvswitch-datapath-dkms_2.5.90-1_all.deb dpkg -i openvswitch-common_2.5.90-1_amd64.deb dpkg -i openvswitch-switch_2.5.90-1_amd64.deb diff --git a/pre_build_hook b/pre_build_hook index d860cb8..c11860a 100755 --- a/pre_build_hook +++ b/pre_build_hook @@ -13,12 +13,15 @@ function build_pkg { cd ${DIR}/ovs_build sudo docker build -t ovs_build . - rm -rf ${DIR}/ovs-dpdk; mkdir -p ${DIR}/ovs-dpdk/; chmod 777 ${DIR}/ovs-dpdk - sudo docker run -v ${DIR}/ovs-dpdk:/deb -t ovs_build /ovs_build/build-ovs-dpdk.sh + rm -rf ${DIR}/deb; mkdir -p ${DIR}/deb; chmod 777 ${DIR}/deb; cd ${DIR}/deb + sudo docker run -v ${DIR}/deb:/deb -t ovs_build /ovs_build/build-ovs-dpdk.sh + tar czvf ../repositories/ubuntu/ovs-dpdk.tar.gz .; cd .. - rm -rf ${DIR}/ovs-nsh; mkdir -p ${DIR}/ovs-nsh/; chmod 777 ${DIR}/ovs-nsh + rm -rf ${DIR}/deb; mkdir -p ${DIR}/deb; chmod 777 ${DIR}/deb; cd ${DIR}/deb sudo docker run -v ${DIR}/ovs-nsh:/deb -t ovs_build /ovs_build/build-ovs-nsh-dpdk.sh + tar czvf ../repositories/ubuntu/ovs-nsh-dpdk.tar.gz .; cd .. + rm -rf ${DIR}/deb; ;; *) echo "Not supported system"; exit 1;; esac