aboutgitcodebugslistschat
path: root/test/distro
diff options
context:
space:
mode:
authorStefano Brivio <sbrivio@redhat.com>2022-09-22 23:00:18 +0200
committerStefano Brivio <sbrivio@redhat.com>2022-09-23 02:46:24 +0200
commitd6f865a40a2b70e8b18983fe091b4761183eaac4 (patch)
tree300663c7666118b3e219a284bb725989ef600fb3 /test/distro
parentcff565a1f66837efe2b94bba110bdcb26dda4b84 (diff)
downloadpasst-d6f865a40a2b70e8b18983fe091b4761183eaac4.tar
passt-d6f865a40a2b70e8b18983fe091b4761183eaac4.tar.gz
passt-d6f865a40a2b70e8b18983fe091b4761183eaac4.tar.bz2
passt-d6f865a40a2b70e8b18983fe091b4761183eaac4.tar.lz
passt-d6f865a40a2b70e8b18983fe091b4761183eaac4.tar.xz
passt-d6f865a40a2b70e8b18983fe091b4761183eaac4.tar.zst
passt-d6f865a40a2b70e8b18983fe091b4761183eaac4.zip
test/distro: Update workarounds for Ubuntu 22.04 on s390x2022_09_23.d6f865a
If we use dhclient without creating a complete network configuration, systemd-resolved will stop working after a while, and this sometimes happens while we're still installing packages. Disable it, together with systemd-networkd, while taking care of removing the dhclient hook that prevents overriding /etc/resolv.conf. While at it, it looks like removing snapd and needrestart actually takes more time than keeping them: drop that line. Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'test/distro')
-rw-r--r--test/distro/ubuntu4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/distro/ubuntu b/test/distro/ubuntu
index aa42c99..343fa03 100644
--- a/test/distro/ubuntu
+++ b/test/distro/ubuntu
@@ -191,7 +191,9 @@ test Ubuntu 22.04 (Jammy Jellyfish), s390x
host ./qrap 5 qemu-system-s390x -m 2048 -smp 2 -serial stdio -nodefaults -nographic __BASEPATH__/prepared-jammy-server-cloudimg-s390x.img -net socket,fd=5 -net nic,model=virtio -device virtio-rng-ccw -snapshot
host export DEBIAN_FRONTEND=noninteractive
-host apt-get -y remove needrestart snapd
+host service systemd-networkd stop
+host service systemd-resolved stop
+host rm /etc/dhcp/dhclient-enter-hooks.d/resolved-enter
host dhclient -4
dns_ready_wait
host apt-get update