Skip to content

Commit

Permalink
kola/tests/ignition/oem: Drop duplicated test
Browse files Browse the repository at this point in the history
The cl.ignition.oem.reuse.new was was using the same ignition config
as cl.ignition.oem.reuse, it only was using different path for
accessing grub.cfg, which is rather pointless to test - accessing
grub.cfg over /oem or /usr/share/oem is beaten to death in other
tests.
  • Loading branch information
krnowak committed May 30, 2023
1 parent 5bf9bb1 commit fe70b0a
Showing 1 changed file with 13 additions and 25 deletions.
38 changes: 13 additions & 25 deletions kola/tests/ignition/oem.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,6 @@ storage:
# Needed if --qemu-skip-mangle is not set
set linux_console="console=ttyS0,115200"
`
reuseContainerLinuxConfig string = `storage:
filesystems:
- name: oem
mount:
device: "/dev/disk/by-label/OEM"
format: "ext4"
files:
- path: /grub.cfg
filesystem: oem
mode: 0644
contents:
inline: |
set linux_append="flatcar.autologin"`
)

func withOldOEMMountpoint(template string) string {
Expand Down Expand Up @@ -138,18 +125,19 @@ func init() {
Platforms: []string{"qemu", "qemu-unpriv"},
MinVersion: semver.Version{Major: 2983},
// Using CLC format here also covers the ign-converter case
UserData: conf.ContainerLinuxConfig(reuseContainerLinuxConfig),
})
register.Register(&register.Test{
Name: "cl.ignition.oem.reuse.new",
Run: reusePartitionNew,
ClusterSize: 1,
Distros: []string{"cl"},
// This test overwrites the grub.cfg which does not work on cloud environments after reboot
Platforms: []string{"qemu", "qemu-unpriv"},
MinVersion: semver.Version{Major: 3603},
// Using CLC format here also covers the ign-converter case
UserData: conf.ContainerLinuxConfig(reuseContainerLinuxConfig),
UserData: conf.ContainerLinuxConfig(`storage:
filesystems:
- name: oem
mount:
device: "/dev/disk/by-label/OEM"
format: "ext4"
files:
- path: /grub.cfg
filesystem: oem
mode: 0644
contents:
inline: |
set linux_append="flatcar.autologin"`),
})
register.Register(&register.Test{
Name: "cl.ignition.oem.wipe",
Expand Down

0 comments on commit fe70b0a

Please sign in to comment.