Add pre pull of e2e images after DiskPressure test

test/e2e_node/eviction_test.go

@@ -521,17 +521,19 @@ func runEvictionTest(f *framework.Framework, pressureTimeout time.Duration, expe
 		})
 
 		ginkgo.AfterEach(func() {
+			defer func() {
+				if expectedNodeCondition == v1.NodeDiskPressure && framework.TestContext.PrepullImages {
+					// The disk eviction test may cause the prepulled images to be evicted,
+					// prepull those images again to ensure this test not affect following tests.
+					PrePullAllImages()
+				}
+			}()
 			ginkgo.By("deleting pods")
 			for _, spec := range testSpecs {
 				ginkgo.By(fmt.Sprintf("deleting pod: %s", spec.pod.Name))
 				f.PodClient().DeleteSync(spec.pod.Name, &metav1.DeleteOptions{}, 10*time.Minute)
 			}
 			reduceAllocatableMemoryUsage()
-			if expectedNodeCondition == v1.NodeDiskPressure && framework.TestContext.PrepullImages {
-				// The disk eviction test may cause the prepulled images to be evicted,
-				// prepull those images again to ensure this test not affect following tests.
-				PrePullAllImages()
-			}
 			ginkgo.By("making sure we can start a new pod after the test")
 			podName := "test-admit-pod"
 			f.PodClient().CreateSync(&v1.Pod{

test/e2e_node/system_node_critical_test.go

@@ -95,6 +95,13 @@ var _ = framework.KubeDescribe("SystemNodeCriticalPod [Slow] [Serial] [Disruptiv
 				}, time.Minute*8, time.Second*4).ShouldNot(gomega.HaveOccurred())
 			})
 			ginkgo.AfterEach(func() {
+				defer 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.By("delete the static pod")
 				err := deleteStaticPod(podPath, staticPodName, ns)
 				gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
@@ -103,6 +110,7 @@ var _ = framework.KubeDescribe("SystemNodeCriticalPod [Slow] [Serial] [Disruptiv
 				gomega.Eventually(func() error {
 					return checkMirrorPodDisappear(f.ClientSet, mirrorPodName, ns)
 				}, time.Minute, time.Second*2).Should(gomega.BeNil())
+
 			})
 		})
 	})