kola: Unify fcos/rhcos's `basic` test
I want to change kola to run `basic` first; no point in running
tons of tests on a system that doesn't boot.  This is a preparatory
step for that, and also just a general cleanup.
@@ -40,7 +40,7 @@ var offServices = []string{
func init() {
register.Register(&register.Test{
- Name: "rhcos.basic",
+ Name: "basic",
Run: LocalTests,
ClusterSize: 1,
NativeFuncs: map[string]func() error{
@@ -48,40 +48,42 @@ func init() {
"DbusPerms": TestDbusPerms,
"NetworkScripts": TestNetworkScripts,
"ServicesActive": TestServicesActive,
- "ServicesDisabled": TestServicesDisabledRHCOS,
"ReadOnly": TestReadOnlyFs,
"Useradd": TestUseradd,
"MachineID": TestMachineID,
},
- Distros: []string{"rhcos"},
+ Distros: []string{"fcos", "rhcos"},
+ })
+ // TODO: enable DockerPing/DockerEcho once fixed
+ register.Register(&register.Test{
+ Name: "fcos.internet",
+ Run: InternetTests,
+ ClusterSize: 1,
+ Flags: []register.Flag{register.RequiresInternetAccess},
+ NativeFuncs: map[string]func() error{
+ "PodmanPing": TestPodmanPing,
+ "PodmanEcho": TestPodmanEcho,
+ },
+ Distros: []string{"fcos"},
})
register.Register(&register.Test{
- Name: "fcos.basic",
+ Name: "rootfs.uuid",
Run: LocalTests,
ClusterSize: 1,
NativeFuncs: map[string]func() error{
- "PortSSH": TestPortSsh,
- "DbusPerms": TestDbusPerms,
- "NetworkScripts": TestNetworkScripts,
- "ServicesActive": TestServicesActive,
- "ReadOnly": TestReadOnlyFs,
"RandomUUID": TestFsRandomUUID,
- "Useradd": TestUseradd,
- "MachineID": TestMachineID,
},
+ // FIXME run on RHCOS once it has https://github.com/coreos/ignition-dracut/pull/93
Distros: []string{"fcos"},
})
- // TODO: enable DockerPing/DockerEcho once fixed
register.Register(&register.Test{
- Name: "fcos.internet",
- Run: InternetTests,
+ Name: "rhcos.services-disabled",
+ Run: LocalTests,
ClusterSize: 1,
- Flags: []register.Flag{register.RequiresInternetAccess},
NativeFuncs: map[string]func() error{
- "PodmanPing": TestPodmanPing,
- "PodmanEcho": TestPodmanEcho,
+ "ServicesDisabled": TestServicesDisabledRHCOS,
},
- Distros: []string{"fcos"},
+ Distros: []string{"rhcos"},
})
}
