github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #102916 from odinuge/serial-tests

Browse Source 
Ensure images are pulled after eviction tests
This commit is contained in:
Kubernetes Prow Robot 2021-08-17 11:41:13 -07:00 committed by GitHub
commit 40a9914801
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e_node/eviction_test.go
View File

@ -51,7 +51,7 @@ import (
const ( const (
postTestConditionMonitoringPeriod = 1 * time.Minute postTestConditionMonitoringPeriod = 1 * time.Minute
evictionPollInterval = 2 * time.Second evictionPollInterval = 2 * time.Second
pressureDisappearTimeout = 1 * time.Minute pressureDisappearTimeout = 10 * time.Minute
// pressure conditions often surface after evictions because the kubelet only updates // pressure conditions often surface after evictions because the kubelet only updates
// node conditions periodically. // node conditions periodically.
// we wait this period after evictions to make sure that we wait out this delay // we wait this period after evictions to make sure that we wait out this delay

8
test/e2e_node/system_node_critical_test.go
View File

@ -38,6 +38,14 @@ var _ = SIGDescribe("SystemNodeCriticalPod [Slow] [Serial] [Disruptive] [NodeFea
// this test only manipulates pods in kube-system // this test only manipulates pods in kube-system
f.SkipNamespaceCreation = true f.SkipNamespaceCreation = true
ginkgo.AfterEach(func() {
if framework.TestContext.PrepullImages {
// The test may cause the prepulled images to be evicted,
// prepull those images again to ensure this test not affect following tests.
PrePullAllImages()
}
})
ginkgo.Context("when create a system-node-critical pod", func() { ginkgo.Context("when create a system-node-critical pod", func() {
tempSetCurrentKubeletConfig(f, func(initialConfig *kubeletconfig.KubeletConfiguration) { tempSetCurrentKubeletConfig(f, func(initialConfig *kubeletconfig.KubeletConfiguration) {
diskConsumed := resource.MustParse("200Mi") diskConsumed := resource.MustParse("200Mi")