Browse Source

Fix wget failures in fuel@opnfv

Change-Id: Ie95dc77f267a385adfe87cb32952d8861a515934
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
tags/10.0-eol
Guo Ruijing 3 years ago
parent
commit
f04f64e8b3
2 changed files with 8 additions and 5 deletions
  1. 2
    2
      deployment_scripts/install.sh
  2. 6
    3
      pre_build_hook

+ 2
- 2
deployment_scripts/install.sh View File

@@ -12,7 +12,7 @@ dpdk=$3
12 12
 
13 13
 if [ $nsh = 'true' ]
14 14
 then
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 16
     dpkg -i openvswitch-datapath-dkms_2.5.90-1.nsh_all.deb
17 17
     dpkg -i openvswitch-common_2.5.90-1.nsh_amd64.deb
18 18
     dpkg -i openvswitch-switch_2.5.90-1.nsh_amd64.deb
@@ -25,7 +25,7 @@ then
25 25
         dpkg -i openvswitch-switch-dpdk_2.5.90-1.nsh_amd64.deb
26 26
     fi
27 27
 else
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 29
     dpkg -i openvswitch-datapath-dkms_2.5.90-1_all.deb
30 30
     dpkg -i openvswitch-common_2.5.90-1_amd64.deb
31 31
     dpkg -i openvswitch-switch_2.5.90-1_amd64.deb

+ 6
- 3
pre_build_hook View File

@@ -13,12 +13,15 @@ function build_pkg {
13 13
       cd ${DIR}/ovs_build
14 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
17
-      sudo docker run -v ${DIR}/ovs-dpdk:/deb -t  ovs_build /ovs_build/build-ovs-dpdk.sh
16
+      rm -rf ${DIR}/deb;  mkdir -p ${DIR}/deb; chmod 777 ${DIR}/deb; cd ${DIR}/deb
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 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 26
     *) echo "Not supported system"; exit 1;;
24 27
   esac

Loading…
Cancel
Save