Skip to content

Commit 331f630

Browse files
authored
Merge pull request #17748 from hakman/automated-cherry-pick-of-#17745-#17747-upstream-release-1.34
Automated cherry pick of #17745: Skip Pod Level Resources tests #17747: Skip Pod InPlace Resize Container tests
2 parents 7e08133 + c1d499e commit 331f630

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

tests/e2e/pkg/tester/skip_regex.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,15 @@ func (t *Tester) setSkipRegexFlag() error {
4444

4545
skipRegex := skipRegexBase
4646

47-
//.Skip.broken.test,.see.https://github.com/kubernetes/kubernetes/pull/133262
47+
if k8sVersion.Minor < 35 {
48+
// cpu.weight value changed in runc 1.3.2
49+
// https://github.com/kubernetes/kubernetes/issues/135214
50+
// https://github.com/opencontainers/runc/issues/4896
51+
skipRegex += "|[Burstable|Guaranteed].QoS.pod"
52+
skipRegex += "|Pod.InPlace.Resize.Container"
53+
}
54+
55+
// Skip broken test, see https://github.com/kubernetes/kubernetes/pull/133262
4856
skipRegex += "|blackbox.*should.not.be.able.to.pull.image.from.invalid.registry"
4957
skipRegex += "|blackbox.*should.be.able.to.pull.from.private.registry.with.secret"
5058

0 commit comments

Comments
 (0)