Skip to content

Commit 124d831

Browse files
authored
Merge pull request #21577 from medyagh/noautoupdate-kvm-ci
test: No auto update aux drivers in integration tests
2 parents d6c68f7 + 97da7a2 commit 124d831

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

test/integration/main_test.go

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ const (
5757
func TestMain(m *testing.M) {
5858
flag.Parse()
5959
setMaxParallelism()
60-
60+
if NeedsAuxDriver() {
61+
*startArgs += " --auto-update-drivers=false"
62+
}
6163
start := time.Now()
6264
code := m.Run()
6365
fmt.Printf("Tests completed in %s (result code %d)\n", time.Since(start), code)
@@ -140,6 +142,11 @@ func HyperVDriver() bool {
140142
return strings.Contains(*startArgs, "--driver=hyperv") || strings.Contains(*startArgs, "--vm-driver=hyperv")
141143
}
142144

145+
// KVM returns true is is KVM driver
146+
func KVMDriver() bool {
147+
return strings.Contains(*startArgs, "--driver=kvm") || strings.Contains(*startArgs, "--vm-driver=kvm") || strings.Contains(*startArgs, "--driver=kvm2") || strings.Contains(*startArgs, "--vm-driver=kvm2")
148+
}
149+
143150
// VirtualboxDriver returns whether or not this test is using the VirtualBox driver
144151
func VirtualboxDriver() bool {
145152
return strings.Contains(*startArgs, "--driver=virtualbox") || strings.Contains(*startArgs, "--vm-driver=virtualbox")
@@ -165,6 +172,11 @@ func KicDriver() bool {
165172
return DockerDriver() || PodmanDriver()
166173
}
167174

175+
// NeedsAuxDriver Returns true if the driver needs an auxiliary driver (kvm, hyperkit,..)
176+
func NeedsAuxDriver() bool {
177+
return HyperVDriver() || KVMDriver()
178+
}
179+
168180
// VMDriver checks if the driver is a VM
169181
func VMDriver() bool {
170182
return !KicDriver() && !NoneDriver()

0 commit comments

Comments
 (0)