From ee197355c673b38d10ad53d61fed4079e976d2a4 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 14 Jul 2020 16:08:16 -0400 Subject: [PATCH] tests/misc-ro: generalize NIC naming test Instead of checking for `ens` on QEMU, just check that the interface name *isn't* `eth*`. This should be cross-platform, so we can drop the `systemd-run` wrapper. --- tests/kola/misc-ro | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/kola/misc-ro b/tests/kola/misc-ro index b4e2546ac2..fab7731db2 100755 --- a/tests/kola/misc-ro +++ b/tests/kola/misc-ro @@ -1,6 +1,6 @@ #!/bin/bash # This is a place to put random quick read-only tests. -set -euo pipefail +set -xeuo pipefail ok() { echo "ok" "$@" @@ -15,5 +15,7 @@ systemctl is-enabled logrotate.service ok logrotate # https://github.com/coreos/fedora-coreos-config/commit/2a5c2abc796ac645d705700bf445b50d4cda8f5f -systemd-run -P -p ConditionVirtualization=kvm --wait /bin/sh -c 'set -euo pipefail; ip link | grep -o -e " ens[0-9]:"' +if ip link | grep -o -e " eth[0-9]:"; then + fatal "detected eth* NIC naming on node" +fi ok nic naming