Skip to content

Commit b304f0c

Browse files
nikita-dubrovskiijbtrystram
authored andcommitted
tests/network: use ethX naming to preserve NIC order by CCW devno on s390x
Signed-off-by: Nikita Dubrovskii <[email protected]>
1 parent 40014a4 commit b304f0c

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

mantle/kola/tests/misc/network.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"fmt"
2020
"net"
2121
"regexp"
22+
"runtime"
2223
"strings"
2324
"time"
2425

@@ -503,6 +504,10 @@ func setupMultipleNetworkTest(c cluster.TestCluster, primaryMac, secondaryMac st
503504
AdditionalNics: 2,
504505
},
505506
}
507+
// On s390x, multiple NICs are ordered by the CCW device number. Use classic ethX names to ensure consistent and ordered naming.
508+
if runtime.GOARCH == "s390x" {
509+
options.AppendKernelArgs = "net.ifnames=0"
510+
}
506511

507512
var userdata = conf.Ignition(fmt.Sprintf(`{
508513
"ignition": {

0 commit comments

Comments
 (0)