Skip to content

Commit 583522a

Browse files
committed
kola/tests: Use disk label for mount partitions test
On s390x, the disk order is not guaranteed, so it is better to use unique labels instead of `/dev/vda`. Additional fixes: - Fix spelling mistake. - Do not assign variable name for unused argument. Signed-off-by: Jan Schintag <[email protected]>
1 parent d84bc0f commit 583522a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

mantle/kola/tests/ignition/mount.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func init() {
3737
Platforms: []string{"qemu"},
3838
Tags: []string{"ignition"},
3939
})
40-
// create new partiitons with disk `vda`
40+
// create new partitions on disk labeled `coreos-boot-disk
4141
register.RegisterTest(&register.Test{
4242
Name: "coreos.ignition.mount.partitions",
4343
Description: "Verify that we can create new partitions through Ignition.",
@@ -89,7 +89,7 @@ func testMountPartitions(c cluster.TestCluster) {
8989

9090
ignDisks := []types.Disk{
9191
{
92-
Device: "/dev/vda",
92+
Device: "/dev/disk/by-id/coreos-boot-disk",
9393
Partitions: []types.Partition{
9494
{
9595
Label: util.StrToPtr("CONTR"),
@@ -108,7 +108,7 @@ func testMountPartitions(c cluster.TestCluster) {
108108
createClusterValidate(c, config, platform.MachineOptions{}, ignDisks, 2097152, 1024)
109109
}
110110

111-
func createClusterValidate(c cluster.TestCluster, config types.Config, options platform.MachineOptions, ignDisks []types.Disk, v2size int, v3sizeMiB int) {
111+
func createClusterValidate(c cluster.TestCluster, config types.Config, options platform.MachineOptions, ignDisks []types.Disk, _ int, v3sizeMiB int) {
112112
var m platform.Machine
113113
var err error
114114
config.Storage.Disks = ignDisks

0 commit comments

Comments
 (0)