summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2016-06-21 02:44:52 +0800
committerGuo Ruijing <ruijing.guo@intel.com>2016-06-20 20:22:03 +0000
commitf04f64e8b3052dd18875d2255f102bc972f0a04b (patch)
tree9a45cb347a64c08eb278468279827adf4cf46d81
parentbee1b2b540922f0a1439d3b878480da590f506d8 (diff)
Fix wget failures in fuel@opnfv
Change-Id: Ie95dc77f267a385adfe87cb32952d8861a515934 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Notes
Notes (review): Code-Review+2: Ruijing <ruijing.guo@intel.com> Workflow+1: Ruijing <ruijing.guo@intel.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 21 Jun 2016 04:30:46 +0000 Reviewed-on: https://review.openstack.org/331918 Project: openstack/fuel-plugin-ovs Branch: refs/heads/master
-rw-r--r--deployment_scripts/install.sh4
-rwxr-xr-xpre_build_hook9
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
12 12
13if [ $nsh = 'true' ] 13if [ $nsh = 'true' ]
14then 14then
15 wget -r -np -nH --cut-dirs=3 http://$host:8080/plugins/fuel-plugin-ovs-0.9/ovs-nsh/ 15 curl http://$host:8080/plugins/fuel-plugin-ovs-0.9/repositories/ubuntu/ovs-nsh-dpdk.tar.gz | tar -xzv
16 dpkg -i openvswitch-datapath-dkms_2.5.90-1.nsh_all.deb 16 dpkg -i openvswitch-datapath-dkms_2.5.90-1.nsh_all.deb
17 dpkg -i openvswitch-common_2.5.90-1.nsh_amd64.deb 17 dpkg -i openvswitch-common_2.5.90-1.nsh_amd64.deb
18 dpkg -i openvswitch-switch_2.5.90-1.nsh_amd64.deb 18 dpkg -i openvswitch-switch_2.5.90-1.nsh_amd64.deb
@@ -25,7 +25,7 @@ then
25 dpkg -i openvswitch-switch-dpdk_2.5.90-1.nsh_amd64.deb 25 dpkg -i openvswitch-switch-dpdk_2.5.90-1.nsh_amd64.deb
26 fi 26 fi
27else 27else
28 wget -r -np -nH --cut-dirs=3 http://$host:8080/plugins/fuel-plugin-ovs-0.9/ovs-dpdk/ 28 curl http://$host:8080/plugins/fuel-plugin-ovs-0.9/repositories/ubuntu/ovs-dpdk.tar.gz | tar -xzv
29 dpkg -i openvswitch-datapath-dkms_2.5.90-1_all.deb 29 dpkg -i openvswitch-datapath-dkms_2.5.90-1_all.deb
30 dpkg -i openvswitch-common_2.5.90-1_amd64.deb 30 dpkg -i openvswitch-common_2.5.90-1_amd64.deb
31 dpkg -i openvswitch-switch_2.5.90-1_amd64.deb 31 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 {
13 cd ${DIR}/ovs_build 13 cd ${DIR}/ovs_build
14 sudo docker build -t ovs_build . 14 sudo docker build -t ovs_build .
15 15
16 rm -rf ${DIR}/ovs-dpdk; mkdir -p ${DIR}/ovs-dpdk/; chmod 777 ${DIR}/ovs-dpdk 16 rm -rf ${DIR}/deb; mkdir -p ${DIR}/deb; chmod 777 ${DIR}/deb; cd ${DIR}/deb
17 sudo docker run -v ${DIR}/ovs-dpdk:/deb -t ovs_build /ovs_build/build-ovs-dpdk.sh 17 sudo docker run -v ${DIR}/deb:/deb -t ovs_build /ovs_build/build-ovs-dpdk.sh
18 tar czvf ../repositories/ubuntu/ovs-dpdk.tar.gz .; cd ..
18 19
19 rm -rf ${DIR}/ovs-nsh; mkdir -p ${DIR}/ovs-nsh/; chmod 777 ${DIR}/ovs-nsh 20 rm -rf ${DIR}/deb; mkdir -p ${DIR}/deb; chmod 777 ${DIR}/deb; cd ${DIR}/deb
20 sudo docker run -v ${DIR}/ovs-nsh:/deb -t ovs_build /ovs_build/build-ovs-nsh-dpdk.sh 21 sudo docker run -v ${DIR}/ovs-nsh:/deb -t ovs_build /ovs_build/build-ovs-nsh-dpdk.sh
22 tar czvf ../repositories/ubuntu/ovs-nsh-dpdk.tar.gz .; cd ..
21 23
24 rm -rf ${DIR}/deb;
22 ;; 25 ;;
23 *) echo "Not supported system"; exit 1;; 26 *) echo "Not supported system"; exit 1;;
24 esac 27 esac