mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-07-17 11:28:58 +00:00
Merge pull request #132077 from ffromani/e2e-node-cgroup-v2-only
e2e: node: cpumanager: require cgroup v2
This commit is contained in:
@@ -171,6 +171,10 @@ var _ = SIGDescribe("CPU Manager", ginkgo.Ordered, framework.WithSerial(), featu
|
||||
})
|
||||
|
||||
ginkgo.JustBeforeEach(func(ctx context.Context) {
|
||||
if !e2enodeCgroupV2Enabled {
|
||||
e2eskipper.Skipf("Skipping since CgroupV2 not used")
|
||||
}
|
||||
|
||||
// note intentionally NOT set reservedCPUs - this must be initialized on a test-by-test basis
|
||||
|
||||
// use a closure to minimize the arguments, to make the usage more straightforward
|
||||
@@ -966,10 +970,6 @@ var _ = SIGDescribe("CPU Manager", ginkgo.Ordered, framework.WithSerial(), featu
|
||||
|
||||
ginkgo.When("checking the CFS quota management", ginkgo.Label("cfs-quota"), func() {
|
||||
ginkgo.BeforeEach(func(ctx context.Context) {
|
||||
if !e2enodeCgroupV2Enabled {
|
||||
e2eskipper.Skipf("Skipping since CgroupV2 not used")
|
||||
}
|
||||
|
||||
// WARNING: this assumes 2-way SMT systems - we don't know how to access other SMT levels.
|
||||
// this means on more-than-2-way SMT systems this test will prove nothing
|
||||
reservedCPUs = cpuset.New(0)
|
||||
|
||||
Reference in New Issue
Block a user