Revert "Add e2e test monitoring current container resource usage"

dbuos · Aug 8, 2015 · 1f7ea4f · 1f7ea4f
1 parent 991775e
commit 1f7ea4f
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 137 deletions.
diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
@@ -105,7 +105,6 @@ GCE_PARALLEL_SKIP_TESTS=(
     "Nodes\sNetwork"
     "Nodes\sResize"
     "MaxPods"
-    "ResourceUsage"
     "SchedulerPredicates"
     "Services.*restarting"
     "Shell.*services"

diff --git a/test/e2e/kubelet_stats.go b/test/e2e/kubelet_stats.go
@@ -195,10 +195,6 @@ type containerResourceUsage struct {
 	CPUInterval time.Duration
 }
 
-func (r *containerResourceUsage) isStrictlyGreaterThan(rhs *containerResourceUsage) bool {
-	return r.CPUUsageInCores > rhs.CPUUsageInCores && r.MemoryUsageInBytes > rhs.MemoryUsageInBytes && r.MemoryWorkingSetInBytes > rhs.MemoryWorkingSetInBytes
-}
-
 // getOneTimeResourceUsageOnNode queries the node's /stats/container endpoint
 // and returns the resource usage of targetContainers for the past
 // cpuInterval.

diff --git a/test/e2e/monitor_resources.go b/test/e2e/monitor_resources.go