delete cadvisor pod after test

This commit is contained in:
David Ashpole 2017-02-03 10:33:43 -08:00
parent ab794c6128
commit 4cd60e2393

View File

@ -385,7 +385,7 @@ func runDensityBatchTest(f *framework.Framework, rc *ResourceCollector, testArg
batchLag := lastRunning.Time.Sub(firstCreate.Time) batchLag := lastRunning.Time.Sub(firstCreate.Time)
rc.Stop() rc.Stop()
deletePodsSync(f, append(pods, getCadvisorPod())) deletePodsSync(f, pods)
// Log time series data. // Log time series data.
if isLogTimeSeries { if isLogTimeSeries {
@ -394,6 +394,8 @@ func runDensityBatchTest(f *framework.Framework, rc *ResourceCollector, testArg
// Log throughput data. // Log throughput data.
logPodCreateThroughput(batchLag, e2eLags, testArg.podsNr, testInfo) logPodCreateThroughput(batchLag, e2eLags, testArg.podsNr, testInfo)
deletePodsSync(f, []*v1.Pod{getCadvisorPod()})
return batchLag, e2eLags return batchLag, e2eLags
} }
@ -419,11 +421,13 @@ func runDensitySeqTest(f *framework.Framework, rc *ResourceCollector, testArg de
batchlag, e2eLags := createBatchPodSequential(f, testPods) batchlag, e2eLags := createBatchPodSequential(f, testPods)
rc.Stop() rc.Stop()
deletePodsSync(f, append(bgPods, append(testPods, getCadvisorPod())...)) deletePodsSync(f, append(bgPods, testPods...))
// Log throughput data. // Log throughput data.
logPodCreateThroughput(batchlag, e2eLags, testArg.podsNr, testInfo) logPodCreateThroughput(batchlag, e2eLags, testArg.podsNr, testInfo)
deletePodsSync(f, []*v1.Pod{getCadvisorPod()})
return batchlag, e2eLags return batchlag, e2eLags
} }