Skip to content

Commit f0718d0

Browse files
committed
fix unattended usb tests
1 parent 36948c8 commit f0718d0

4 files changed

Lines changed: 20 additions & 4 deletions

File tree

‎.github/workflows/debian-iso-e2e.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ jobs:
4141
sudo chmod a+rw /dev/kvm
4242
fi
4343
44+
- name: Enable ICMP for QEMU user networking
45+
run: sudo sysctl -w net.ipv4.ping_group_range="0 2147483647"
46+
4447
- name: Complete Debian unattended UEFI USB installation
4548
env:
4649
E2E_BOOT_MODE: usb

‎.github/workflows/ubuntu-iso-e2e.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ jobs:
3838
sudo chmod a+rw /dev/kvm
3939
fi
4040
41+
- name: Enable ICMP for QEMU user networking
42+
run: sudo sysctl -w net.ipv4.ping_group_range="0 2147483647"
43+
4144
- name: Complete Ubuntu unattended UEFI USB installation
4245
env:
4346
E2E_BOOT_MODE: usb

‎scripts/check-disks.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
2-
#
3-
# This is run by d-i before the partman step (e.g. d-i partman/early_command)
2+
# Selects non-USB disks for Debian partitioning before the partman step.
3+
# It gives GRUB the same targets so the installer USB is never selected.
44

55
USBDEV=$(list-devices usb-partition | sed "s/\(.*\)./\1/" | sort -u | head -1 );
66
if [ -z "${USBDEV}" ]; then
@@ -12,4 +12,5 @@ for DISK in ${DEVICE}; do
1212
DISKS="${DISKS} ${DISK}";
1313
done;
1414
DISKS=$(echo "${DISKS}" | sed "s/^ //g");
15-
debconf-set partman-auto/disk "$DISKS";
15+
debconf-set partman-auto/disk "$DISKS";
16+
debconf-set grub-installer/bootdev "$DISKS";

‎scripts/dappnode_install.sh‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,16 @@ normalize_ipfs_version_ref() {
428428
local cid_path="$ref"
429429
local manifest_url="${IPFS_ENDPOINT%/}${cid_path}/dappnode_package.json"
430430
local manifest
431-
manifest="$(download_stdout "$manifest_url" 2>/dev/null || true)"
431+
local attempt
432+
for attempt in 1 2 3 4 5; do
433+
manifest="$(download_stdout "$manifest_url" 2>/dev/null || true)"
434+
if [[ -n "$manifest" ]]; then
435+
break
436+
fi
437+
if [[ "$attempt" -lt 5 ]]; then
438+
sleep 2
439+
fi
440+
done
432441
if [[ -z "$manifest" ]]; then
433442
error "Could not fetch IPFS manifest for ${comp} from: $manifest_url"
434443
error "Provide ${comp}_VERSION as /ipfs/<cid>:<version> (example: /ipfs/Qm...:0.2.11)"

0 commit comments

Comments
 (0)