Skip to content

Commit 57d5691

Browse files
kola: mark tests for SCOS and RHCOS
1 parent fee1f72 commit 57d5691

File tree

14 files changed

+22
-22
lines changed

14 files changed

+22
-22
lines changed

mantle/kola/tests/coretest/core.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func init() {
109109
NativeFuncs: map[string]register.NativeFuncWrap{
110110
"ServicesDisabled": register.CreateNativeFuncWrap(TestServicesDisabledRHCOS),
111111
},
112-
Distros: []string{"rhcos"},
112+
Distros: []string{"rhcos", "scos"},
113113
})
114114
}
115115

mantle/kola/tests/crio/crio.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ func init() {
192192
ClusterSize: 1,
193193
Name: `crio.base`,
194194
Description: "Verify cri-o basic funcions work, include storage driver is overlay, storage root is /varlib/containers/storage, cgroup driver is systemd, and cri-o containers have reliable networking",
195-
Distros: []string{"rhcos"},
195+
Distros: []string{"rhcos", "scos"},
196196
UserData: enableCrioIgn,
197197
// crio pods require fetching a kubernetes pause image
198198
Tags: []string{"crio", kola.NeedsInternetTag},
@@ -203,7 +203,7 @@ func init() {
203203
ClusterSize: 2,
204204
Name: "crio.network",
205205
Description: "Verify crio containers can make network connections outside of the host.",
206-
Distros: []string{"rhcos"},
206+
Distros: []string{"rhcos", "scos"},
207207
UserData: enableCrioIgn,
208208
// this test requires net connections outside the host
209209
Tags: []string{"crio", kola.NeedsInternetTag},

mantle/kola/tests/etcd/rhcos.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func init() {
5454
}
5555
}`),
5656
Tags: []string{kola.NeedsInternetTag}, // fetching etcd requires networking
57-
Distros: []string{"rhcos"},
57+
Distros: []string{"rhcos", "scos"},
5858
// qemu machines cannot communicate between each other
5959
ExcludePlatforms: []string{"qemu"},
6060
})
@@ -89,7 +89,7 @@ func init() {
8989
}
9090
}`),
9191
Tags: []string{kola.NeedsInternetTag}, // fetching etcd requires networking
92-
Distros: []string{"rhcos"},
92+
Distros: []string{"rhcos", "scos"},
9393
// qemu machines cannot communicate between each other
9494
ExcludePlatforms: []string{"qemu"},
9595
})

mantle/kola/tests/fips/failure.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func init() {
9090
ClusterSize: 0,
9191
Platforms: []string{"qemu"},
9292
Tags: []string{"ignition"},
93-
Distros: []string{"rhcos"},
93+
Distros: []string{"rhcos", "scos"},
9494
})
9595
}
9696

mantle/kola/tests/fips/fips.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ func init() {
1414
Name: `fips.enable`,
1515
Description: "Verify that fips enabled works.",
1616
Flags: []register.Flag{},
17-
Distros: []string{"rhcos"},
17+
Distros: []string{"rhcos", "scos"},
1818
UserData: conf.Ignition(`{
1919
"ignition": {
2020
"config": {
@@ -62,7 +62,7 @@ func init() {
6262
Name: `fips.enable.partitions`,
6363
Description: "Verify that fips enabled works if custom partitions are present.",
6464
Flags: []register.Flag{},
65-
Distros: []string{"rhcos"},
65+
Distros: []string{"rhcos", "scos"},
6666
Platforms: []string{"qemu"},
6767
UserData: conf.Ignition(`{
6868
"ignition": {

mantle/kola/tests/ignition/luks.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func init() {
2727
Name: `luks.tang`,
2828
Description: "Verify that the rootfs is encrypted with Tang.",
2929
Flags: []register.Flag{},
30-
Distros: []string{"rhcos"},
30+
Distros: []string{"rhcos", "scos"},
3131
Tags: []string{"luks", "tang", kola.NeedsInternetTag, "reprovision"},
3232
})
3333
register.RegisterTest(&register.Test{
@@ -36,7 +36,7 @@ func init() {
3636
Name: `luks.sss.t1`,
3737
Description: "Verify that the rootfs is encrypted with SSS with t=1.",
3838
Flags: []register.Flag{},
39-
Distros: []string{"rhcos"},
39+
Distros: []string{"rhcos", "scos"},
4040
Platforms: []string{"qemu"},
4141
ExcludeArchitectures: []string{"s390x"}, // no TPM backend support for s390x
4242
Tags: []string{"luks", "tpm", "tang", "sss", kola.NeedsInternetTag, "reprovision"},
@@ -47,7 +47,7 @@ func init() {
4747
Name: `luks.sss.t2`,
4848
Description: "Verify that the rootfs is encrypted with SSS with t=2.",
4949
Flags: []register.Flag{},
50-
Distros: []string{"rhcos"},
50+
Distros: []string{"rhcos", "scos"},
5151
Platforms: []string{"qemu"},
5252
ExcludeArchitectures: []string{"s390x"}, // no TPM backend support for s390x
5353
Tags: []string{"luks", "tpm", "tang", "sss", kola.NeedsInternetTag, "reprovision"},

mantle/kola/tests/ignition/units.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func init() {
5656
// in a given system if the version of systemd is older than
5757
// 240. RHCOS deosn't support this feature currently because
5858
// its running an older version (v239) of systemd.
59-
ExcludeDistros: []string{"rhcos"},
59+
ExcludeDistros: []string{"rhcos", "scos"},
6060
})
6161
}
6262

mantle/kola/tests/misc/aws.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func init() {
2626
Platforms: []string{"aws"},
2727
Run: awsVerifyDiskFriendlyName,
2828
ClusterSize: 1,
29-
Distros: []string{"rhcos"},
29+
Distros: []string{"rhcos", "scos"},
3030
})
3131
}
3232

mantle/kola/tests/misc/network.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func init() {
5656
Name: "rhcos.network.multiple-nics",
5757
Description: "Verify configuring networking with multiple NICs work.",
5858
Timeout: 20 * time.Minute,
59-
Distros: []string{"rhcos"},
59+
Distros: []string{"rhcos", "scos"},
6060
Platforms: []string{"qemu"},
6161
})
6262
// This test follows the same network configuration used on https://github.com/RHsyseng/rhcos-slb
@@ -68,7 +68,7 @@ func init() {
6868
Name: "rhcos.network.init-interfaces-test",
6969
Description: "Verify init-interfaces script works in both fresh setup and reboot.",
7070
Timeout: 40 * time.Minute,
71-
Distros: []string{"rhcos"},
71+
Distros: []string{"rhcos", "scos"},
7272
Platforms: []string{"qemu"},
7373
RequiredTag: "openshift",
7474
AdditionalNics: 2,

mantle/kola/tests/misc/nfs-client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func init() {
100100
Platforms: []string{"qemu"},
101101

102102
// RHCOS has a separate test for NFS v4 server and client
103-
ExcludeDistros: []string{"rhcos"},
103+
ExcludeDistros: []string{"rhcos", "scos"},
104104
})
105105
}
106106

0 commit comments

Comments
 (0)