fix(find): prevent Ubuntu ARM switching to non-ubuntu-ports mirrors

Author: sebthom

fast-apt-mirror.sh

@@ -305,11 +305,10 @@ function find_fast_mirror() {
         mirrors=$(
           echo "$mirrors" | awk '{
             url=$0
-            if (url ~ /\/ubuntu(-ports)?\/?$/) {
-              sub(/\/ubuntu\/?$/, "/ubuntu-ports/", url)
-            }
-            print url
-          }'
+            if (url ~ /\/ubuntu-ports(\/|$)/) { print url; next }
+            if (url ~ /\/ubuntu\//) { sub(/\/ubuntu\//, "/ubuntu-ports/", url); print url; next }
+            if (url ~ /\/ubuntu\/?$/) { sub(/\/ubuntu\/?$/, "/ubuntu-ports/", url); print url; next }
+          }' | awk 'NF'
         )
         mirrors+=$'\n'"$reference_mirror"
         # Some mirrors may not expose per-arch Contents files for all pockets, but InRelease should exist.
@@ -473,9 +472,9 @@ function find_fast_mirror() {
   local speedtest_mirrors=''
   if [[ ${#preferred_mirrors[@]} -gt 0 ]]; then
     for preferred_mirror in "${preferred_mirrors[@]}"; do
-      if echo "$healthy_mirrors" | awk -v p="$preferred_mirror" 'BEGIN{sub(/\/+$/, "", p)} {u=$0; sub(/\/+$/, "", u); if (u==p) {found=1; exit}} END{exit !found}'; then
-        speedtest_mirrors+=$preferred_mirror$'\n'
-      fi
+      local matched_preferred_mirror
+      matched_preferred_mirror=$(echo "$healthy_mirrors" | awk -v p="$preferred_mirror" 'BEGIN{sub(/\/+$/, "", p)} {u=$0; key=u; sub(/\/+$/, "", key); if (key==p) {print u; exit}}')
+      if [[ -n $matched_preferred_mirror ]]; then speedtest_mirrors+=$matched_preferred_mirror$'\n'; fi
     done
   fi
   speedtest_mirrors=$(echo "$speedtest_mirrors$healthy_mirrors" | awk 'NF' | unique | max_lines "$max_speedtests")
@@ -489,7 +488,7 @@ function find_fast_mirror() {
     echo "$speedtest_mirrors" \
     | awk 'NF' \
     | __xargs -P $((download_parallel)) -I{} bash -c \
-          "printf '%s\t%s\n' \"\$(curl -r 0-$((sample_size_kb*1024)) --max-time $((sample_time_secs)) -sS -w '%{speed_download}' -o /dev/null \"\${1}ls-lR.gz\" 2>/dev/null || echo 0)\" \"\$1\"; >&2 echo -n '.'" _ {} \
+          "printf '%s\t%s\n' \"\$(curl -fL -r 0-$((sample_size_kb*1024)) --max-time $((sample_time_secs)) -sS -w '%{speed_download}' -o /dev/null \"\${1}ls-lR.gz\" 2>/dev/null || echo 0)\" \"\$1\"; >&2 echo -n '.'" _ {} \
     | awk -F'\t' '$1 ~ /^[0-9.]+$/ && $2 ~ /^https?:\/\// { print }' \
     | sort -rg
   ) || return $RC_MISC_ERROR

tests/fast-apt-mirror.bats

@@ -90,7 +90,13 @@ function get_dist_name() {
 @test "find: Find mirror if executed with arguments" {
   assert_exitcode $RC_OK find --sample-size 10 --healthchecks 8 --ignore-sync-state --speedtests 2 --country DE
   assert_regex "$output" 'Randomly selecting 8 mirrors...done'
-  assert_regex "$output" 'Speed testing 2 of the available'
+  arch=$(dpkg --print-architecture 2>/dev/null || echo amd64)
+  if [[ $arch == arm64 || $arch == armhf ]]; then
+    # On Ubuntu ARM, depending on country, there currently may be fewer than 2 reachable ubuntu-ports mirrors.
+    assert_regex "$output" 'Speed testing [12] of the available'
+  else
+    assert_regex "$output" 'Speed testing 2 of the available'
+  fi
   assert_regex "$output" '(sample download size: 10KB)'
   assert_regex "$output" '=> (https?|ftp)://.* determined as fastest mirror'
   refute_regex "$output" 'ERROR:'
@@ -99,7 +105,13 @@ function get_dist_name() {
 @test "find: Find mirror with --ignore-sync-state only" {
   assert_exitcode $RC_OK find --ignore-sync-state --speedtests 2 --healthchecks 8 --country DE
   assert_regex "$output" 'Randomly selecting 8 mirrors...done'
-  assert_regex "$output" 'Speed testing 2 of the available'
+  arch=$(dpkg --print-architecture 2>/dev/null || echo amd64)
+  if [[ $arch == arm64 || $arch == armhf ]]; then
+    # On Ubuntu ARM, depending on country, there currently may be fewer than 2 reachable ubuntu-ports mirrors.
+    assert_regex "$output" 'Speed testing [12] of the available'
+  else
+    assert_regex "$output" 'Speed testing 2 of the available'
+  fi
   assert_regex "$output" '=> (https?|ftp)://.* determined as fastest mirror'
   refute_regex "$output" 'Fastest mirror detection returned invalid URL'
 }
@@ -150,7 +162,9 @@ function get_dist_name() {
             arch=$(dpkg --print-architecture 2>/dev/null || echo amd64)
             if [[ $arch == arm64 || $arch == armhf ]]; then
               mirror_url1=http://ports.ubuntu.com/ubuntu-ports
-              mirror_url2=http://ftp.tu-chemnitz.de/pub/linux/ubuntu-ports
+              # Avoid flaky third-party mirrors on ARM (mirror sync in progress can break apt-get update).
+              # Use ports.ubuntu.com with a trailing-slash variant to still test set changes.
+              mirror_url2=http://ports.ubuntu.com/ubuntu-ports/
             else
               mirror_url1=http://archive.ubuntu.com/ubuntu
               mirror_url2=https://ftp.uni-stuttgart.de/ubuntu