windows: ignore "apt-get update" errors

... as they are ignored in scripts/build_utils.sh since commit
3517941ef2aa ("script/build_utils.sh: don't fail if any mirror is not
accessible").  This is prompted by an issue with libboost repo, which
started returning 403 Forbidden errors.

While at it, skip fetching language and translation packs.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/ceph-windows-image-build/build/build b/ceph-windows-image-build/build/build
index 38c7e1fe644e58759287889f2b0f1f6a9b665d95..35e9c23b95e2b009a7a9379190b7a728198cc271 100755 (executable)
--- a/ceph-windows-image-build/build/build
+++ b/ceph-windows-image-build/build/build
@@ -37,15 +37,15 @@ function restart_windows_vm() {
 
 
 if ! which virt-install >/dev/null; then
-    sudo apt-get update
+    sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none || true
     sudo apt-get install -y virtinst
 fi
 if ! which xmllint >/dev/null; then
-    sudo apt-get update
+    sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none || true
     sudo apt-get install -y libxml2-utils
 fi
 if ! which jq >/dev/null; then
-    sudo apt-get update
+    sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none || true
     sudo apt-get install -y jq
 fi
 

diff --git a/ceph-windows-installer-build/build/setup b/ceph-windows-installer-build/build/setup
index bd670806e91a5870119a0516f8771ceff0bdcf6e..19970b95f38ef3c7d94c0f31e49575425ae0343b 100644 (file)
--- a/ceph-windows-installer-build/build/setup
+++ b/ceph-windows-installer-build/build/setup
@@ -42,7 +42,7 @@ update_build_status "started" "ceph-windows-installer" $DISTRO $DISTRO_VERSION $
 # Install requirements (if needed)
 #
 if ! which unzip >/dev/null; then
-    sudo apt-get update
+    sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none || true
     sudo apt-get install -y unzip
 fi
 

diff --git a/scripts/ceph-windows/setup_libvirt b/scripts/ceph-windows/setup_libvirt
index 2b1bb76577d604f8f2c743b54382956ddcbd5ada..a50091f1e4df7490144a0304ef036659b7f8cc87 100644 (file)
--- a/scripts/ceph-windows/setup_libvirt
+++ b/scripts/ceph-windows/setup_libvirt
@@ -22,11 +22,11 @@ function get_libvirt_vm_ssh_address() {
     fi
 
     if ! which xmllint >/dev/null; then
-        sudo apt-get update
+        sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none || true
         sudo apt-get install -y libxml2-utils
     fi
     if ! which jq >/dev/null; then
-        sudo apt-get update
+        sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none || true
         sudo apt-get install -y jq
     fi
 
@@ -74,7 +74,7 @@ function get_libvirt_vm_ssh_address() {
 #
 # Setup requirements (if needed)
 #
-sudo apt-get update
+sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none || true
 sudo apt-get install -y libvirt-daemon-system virtinst cloud-image-utils qemu-kvm
 
 # Ensure that the libvirt socket is available, otherwise virsh commands will fail.

diff --git a/scripts/ceph-windows/win32_build b/scripts/ceph-windows/win32_build
index 7f7568ede97168c9cfa38aba177bf31dac446160..51acc910aef1b30a356c87131bbd9ebe89d26b05 100644 (file)
--- a/scripts/ceph-windows/win32_build
+++ b/scripts/ceph-windows/win32_build
@@ -25,7 +25,7 @@ set -o pipefail
 
 cd ~/ceph
 
-sudo apt-get update
+sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none || true
 sudo apt-get install -y git
 git submodule update --init --recursive
 

diff --git a/wnbd-build/build/build b/wnbd-build/build/build
index a642114e320c784a902e7f279a57f16a8a04ceb8..4183206574b3438e311aabd3c05f64f380e213f3 100644 (file)
--- a/wnbd-build/build/build
+++ b/wnbd-build/build/build
@@ -15,7 +15,7 @@ BUILD_CONFIGURATION=${BUILD_CONFIGURATION:-"Release"}
 # Install requirements (if needed)
 #
 if ! which zip >/dev/null; then
-    sudo apt-get update
+    sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none || true
     sudo apt-get install -y zip
 fi