Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cgroupv1: do not run tests for version >= 4179 #569

Merged
merged 2 commits into from
Dec 12, 2024
Merged

cgroupv1: do not run tests for version >= 4179 #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fe8bbd
cgroupv1: do not run tests for version >= 4152
ader1990 Dec 2, 2024
7463baf
cgroupv1: kubeadm: do not run tests for version >= 4179
ader1990 Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions kola/tests/kubeadm/kubeadm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"bytes"
"encoding/base64"
"fmt"
"math"
"strings"
"text/template"
"time"
Expand Down Expand Up @@ -146,10 +147,12 @@ func init() {
testParams["Release"] = version

cgroupSuffix := ""
var major int64 = 0
var majorMinVersion int64 = 0
var majorEndVersion int64 = math.MaxInt64
if testParams["cgroupv1"].(bool) {
cgroupSuffix = ".cgroupv1"
major = 3140
majorMinVersion = 3140
majorEndVersion = 4179
}

if CNI == "flannel" {
Expand All @@ -160,8 +163,8 @@ func init() {
mmv := (int64)(mmvi.(int))
// Careful, so we don't lower
// the min version too much.
if mmv > major {
major = mmv
if mmv > majorMinVersion {
majorMinVersion = mmv
}
}

Expand All @@ -174,7 +177,8 @@ func init() {
Run: func(c cluster.TestCluster) {
kubeadmBaseTest(c, testParams)
},
MinVersion: semver.Version{Major: major},
MinVersion: semver.Version{Major: majorMinVersion},
EndVersion: semver.Version{Major: majorEndVersion},
ader1990 marked this conversation as resolved.
Show resolved Hide resolved
Flags: flags,
})
}
Expand Down
1 change: 1 addition & 0 deletions kola/tests/misc/cgroup1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ func init() {
},
Distros: []string{"cl"},
MinVersion: semver.Version{Major: 3033},
EndVersion: semver.Version{Major: 4179},
// This test is normally not related to the cloud environment
Platforms: []string{"qemu", "qemu-unpriv"},
})
Expand Down
Loading