From 4cd60e23937d0180bad016604632aa3247c32747 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Fri, 3 Feb 2017 10:33:43 -0800 Subject: [PATCH] delete cadvisor pod after test --- test/e2e_node/density_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/e2e_node/density_test.go b/test/e2e_node/density_test.go index 08162f28fb2..d9d885c7a00 100644 --- a/test/e2e_node/density_test.go +++ b/test/e2e_node/density_test.go @@ -385,7 +385,7 @@ func runDensityBatchTest(f *framework.Framework, rc *ResourceCollector, testArg batchLag := lastRunning.Time.Sub(firstCreate.Time) rc.Stop() - deletePodsSync(f, append(pods, getCadvisorPod())) + deletePodsSync(f, pods) // Log time series data. if isLogTimeSeries { @@ -394,6 +394,8 @@ func runDensityBatchTest(f *framework.Framework, rc *ResourceCollector, testArg // Log throughput data. logPodCreateThroughput(batchLag, e2eLags, testArg.podsNr, testInfo) + deletePodsSync(f, []*v1.Pod{getCadvisorPod()}) + return batchLag, e2eLags } @@ -419,11 +421,13 @@ func runDensitySeqTest(f *framework.Framework, rc *ResourceCollector, testArg de batchlag, e2eLags := createBatchPodSequential(f, testPods) rc.Stop() - deletePodsSync(f, append(bgPods, append(testPods, getCadvisorPod())...)) + deletePodsSync(f, append(bgPods, testPods...)) // Log throughput data. logPodCreateThroughput(batchlag, e2eLags, testArg.podsNr, testInfo) + deletePodsSync(f, []*v1.Pod{getCadvisorPod()}) + return batchlag, e2eLags }