diff --git a/hack/conformance-test.sh b/hack/conformance-test.sh index 9472d7cf188..7b649b74e81 100755 --- a/hack/conformance-test.sh +++ b/hack/conformance-test.sh @@ -103,7 +103,7 @@ echo "Conformance test checking conformance with Kubernetes version 1.0" # MaxPods\slimit\snumber\sof\spods: not sure why this wasn't working on GCE but it wasn't. # Kubectl\sclient\sSimple\spod: not sure why this wasn't working on GCE but it wasn't # DNS: not sure why this wasn't working on GCE but it wasn't -export CONFORMANCE_TEST_SKIP_REGEX="Cadvisor|MasterCerts|Density|Cluster\slevel\slogging|Etcd\sfailure|Load\sCapacity|Monitoring|Namespaces.*seconds|Pod\sdisks|Reboot|Restart|Nodes|Scale|Services.*load\sbalancer|Services.*NodePort|Services.*nodeport|Shell|SSH|Addon\supdate|Volumes|Clean\sup\spods\son\snode|Skipped|skipped|MaxPods\slimit\snumber\sof\spods|Kubectl\sclient\sSimple\spod|DNS" +export CONFORMANCE_TEST_SKIP_REGEX="Cadvisor|MasterCerts|Density|Cluster\slevel\slogging|Etcd\sfailure|Load\sCapacity|Monitoring|Namespaces.*seconds|Pod\sdisks|Reboot|Restart|Nodes|Scale|Services.*load\sbalancer|Services.*NodePort|Services.*nodeport|Shell|SSH|Addon\supdate|Volumes|Clean\sup\spods\son\snode|Skipped|skipped|MaxPods\slimit\snumber\sof\spods|Kubectl\sclient\sSimple\spod|DNS|Resource\susage\sof\ssystem\scontainers" declare -x KUBERNETES_CONFORMANCE_TEST="y" declare -x NUM_MINIONS=4 diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 7dfd30cb80a..9597926e09f 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -117,7 +117,7 @@ GKE_REQUIRED_SKIP_TESTS=( GCE_FLAKY_TESTS=( "DaemonRestart" "Daemon\sset\sshould\slaunch\sa\sdaemon\spod\son\severy\snode\sof\sthe\scluster" - "ResourceUsage" + "Resource\susage\sof\ssystem\scontainers" "monotonically\sincreasing\srestart\scount" "should\sbe\sable\sto\schange\sthe\stype\sand\snodeport\ssettings\sof\sa\sservice" # file: service.go, issue: #13032 "allows\sscheduling\sof\spods\son\sa\sminion\safter\sit\srejoins\sthe\scluster" # file: resize_nodes.go, issue: #13258 @@ -141,7 +141,7 @@ GCE_PARALLEL_SKIP_TESTS=( "Nodes\sNetwork" "Nodes\sResize" "MaxPods" - "ResourceUsage" + "Resource\susage\sof\ssystem\scontainers" "SchedulerPredicates" "Services.*restarting" "Shell.*services" diff --git a/test/e2e/monitor_resources.go b/test/e2e/monitor_resources.go index b8403de9335..9be31ed5cef 100644 --- a/test/e2e/monitor_resources.go +++ b/test/e2e/monitor_resources.go @@ -83,9 +83,9 @@ func computeAverage(sliceOfUsages []resourceUsagePerContainer) (result resourceU return } -// This tests does nothing except checking current resource usage of containers defained in kubelet_stats systemContainers variable. +// This tests does nothing except checking current resource usage of containers defined in kubelet_stats systemContainers variable. // Test fails if an average container resource consumption over datapointAmount tries exceeds amount defined in allowedUsage. -var _ = Describe("ResourceUsage", func() { +var _ = Describe("Resource usage of system containers", func() { var c *client.Client BeforeEach(func() { var err error