TEST-{20,50,60,70): set MACAddressPolicy=keep

New systemd defaults to generating MAC addresses for software devices (whereas
previously they would inherit them from the first enslaved slave).

Sadly, among the things this breaks is our test fixture, where the dhcp servers
are configured to expect a particular MAC address. Disable this for the
affected tests, which are essentially the ones that use bridges and bonds.

diff --git a/test/TEST-20-NFS/99-default.link b/test/TEST-20-NFS/99-default.link
new file mode 100644 (file)
index 0000000..b992bfd
--- /dev/null
+++ b/test/TEST-20-NFS/99-default.link
@@ -0,0 +1,6 @@
+[Match]
+OriginalName=*
+
+[Link]
+NamePolicy=keep kernel database onboard slot path
+MACAddressPolicy=keep

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index 4ad7fd77078cf39814690f02e20eae1b772efbfa..b28337176f03e2e11aba64342a0e05889d8f1177 100755 (executable)
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -342,6 +342,7 @@ test_setup() {
         inst_hook shutdown-emergency 000 ./hard-off.sh
         inst_hook emergency 000 ./hard-off.sh
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+        inst_simple ./99-default.link /etc/systemd/network/99-default.link
     )
 
     # Make server's dracut image

diff --git a/test/TEST-50-MULTINIC/99-default.link b/test/TEST-50-MULTINIC/99-default.link
new file mode 100644 (file)
index 0000000..b992bfd
--- /dev/null
+++ b/test/TEST-50-MULTINIC/99-default.link
@@ -0,0 +1,6 @@
+[Match]
+OriginalName=*
+
+[Link]
+NamePolicy=keep kernel database onboard slot path
+MACAddressPolicy=keep

diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
index ff2961dc9d73c9338fe77828a742d62db469f426..fa7526380b2a1709a58955b3055330f40a06d627 100755 (executable)
--- a/test/TEST-50-MULTINIC/test.sh
+++ b/test/TEST-50-MULTINIC/test.sh
@@ -281,6 +281,7 @@ test_setup() {
         inst_hook shutdown-emergency 000 ./hard-off.sh
         inst_hook emergency 000 ./hard-off.sh
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+        inst_simple ./99-default.link /etc/systemd/network/99-default.link
     )
 
     # Make server's dracut image

diff --git a/test/TEST-60-IFCFG/99-default.link b/test/TEST-60-IFCFG/99-default.link
new file mode 100644 (file)
index 0000000..b992bfd
--- /dev/null
+++ b/test/TEST-60-IFCFG/99-default.link
@@ -0,0 +1,6 @@
+[Match]
+OriginalName=*
+
+[Link]
+NamePolicy=keep kernel database onboard slot path
+MACAddressPolicy=keep

diff --git a/test/TEST-60-IFCFG/test.sh b/test/TEST-60-IFCFG/test.sh
index 8e8bd982d9f5934dfa7ea9292b0fbe7fbb881fb3..73dc109e8ac50223477252d5f60753501309f9c4 100755 (executable)
--- a/test/TEST-60-IFCFG/test.sh
+++ b/test/TEST-60-IFCFG/test.sh
@@ -302,6 +302,7 @@ test_setup() {
         inst_multiple poweroff shutdown
         inst_hook emergency 000 ./hard-off.sh
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+        inst_simple ./99-default.link /etc/systemd/network/99-default.link
     )
 
     # Make server's dracut image

diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/99-default.link b/test/TEST-70-BONDBRIDGETEAMVLAN/99-default.link
new file mode 100644 (file)
index 0000000..b992bfd
--- /dev/null
+++ b/test/TEST-70-BONDBRIDGETEAMVLAN/99-default.link
@@ -0,0 +1,6 @@
+[Match]
+OriginalName=*
+
+[Link]
+NamePolicy=keep kernel database onboard slot path
+MACAddressPolicy=keep

diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
index b6dd080c82254ab7751c6698cc4e2580c10d828f..62582c31f45d590c117a53a2a6c6b229249c6b3a 100755 (executable)
--- a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
+++ b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
@@ -302,6 +302,7 @@ test_setup() {
         inst_multiple poweroff shutdown
         inst_hook emergency 000 ./hard-off.sh
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+        inst_simple ./99-default.link /etc/systemd/network/99-default.link
     )
 
     # Make server's dracut image