Skip to content

Commit ec20f34

Browse files
committed
kola/tests: move OCP tests to RequiredTag
Now that the layered CoreOS work has landed, the variants built by cosa no longer have OCP components. So let's default to not running OpenShift tests at the kola level by changing them to use `RequiredTag`. This will allow us to drop the `--tag !openshift` in various places. Running OpenShift tests will require passing `--tag openshift`.
1 parent 0444f22 commit ec20f34

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

mantle/kola/tests/crio/crio.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ func init() {
195195
Distros: []string{"rhcos"},
196196
UserData: enableCrioIgn,
197197
// crio pods require fetching a kubernetes pause image
198-
Tags: []string{"crio", kola.NeedsInternetTag, "openshift"},
198+
Tags: []string{"crio", kola.NeedsInternetTag},
199+
RequiredTag: "openshift",
199200
})
200201
register.RegisterTest(&register.Test{
201202
Run: crioNetwork,
@@ -205,7 +206,8 @@ func init() {
205206
Distros: []string{"rhcos"},
206207
UserData: enableCrioIgn,
207208
// this test requires net connections outside the host
208-
Tags: []string{"crio", kola.NeedsInternetTag, "openshift"},
209+
Tags: []string{"crio", kola.NeedsInternetTag},
210+
RequiredTag: "openshift",
209211
// qemu machines cannot communicate between each other
210212
ExcludePlatforms: []string{"qemu"},
211213
})

mantle/kola/tests/misc/network.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func init() {
6969
Timeout: 40 * time.Minute,
7070
Distros: []string{"rhcos"},
7171
Platforms: []string{"qemu"},
72-
Tags: []string{"openshift"},
72+
RequiredTag: "openshift",
7373
AdditionalNics: 2,
7474
UserData: userdata,
7575
})

0 commit comments

Comments
 (0)