diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 940f9a52ee9..1ffdc3f2856 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -325,12 +325,7 @@ AWS_REQUIRED_SKIP_TESTS=( # Tests which kills or restarts components and/or nodes. DISRUPTIVE_TESTS=( - "DaemonRestart" - "Etcd\sfailure" - "Nodes\sNetwork" - "Nodes\sResize" - "Reboot" - "Services.*restarting" + "\[Disruptive\]" ) # The following tests are known to be flaky, and are thus run only in their own @@ -366,16 +361,12 @@ GCE_SLOW_TESTS=( ) # Tests which are not able to be run in parallel. +# +# TODO(ihmccreery) I'd like to get these combined with DISRUPTIVE_TESTS. GCE_PARALLEL_SKIP_TESTS=( - "GCE\sL7\sLoadBalancer\sController" # namespaced watch flakes, issue: #17805 - "Nodes\sNetwork" - "MaxPods" - "Resource\susage\sof\ssystem\scontainers" - "SchedulerPredicates" - "resource\susage\stracking" - "NodeOutOfDisk" - "${DISRUPTIVE_TESTS[@]}" - ) + "\[Serial\]" + "\[Disruptive\]" +) # Tests which are known to be flaky when run in parallel. GCE_PARALLEL_FLAKY_TESTS=( diff --git a/test/e2e/daemon_restart.go b/test/e2e/daemon_restart.go index ac2b354718d..6bd4ebe685e 100644 --- a/test/e2e/daemon_restart.go +++ b/test/e2e/daemon_restart.go @@ -183,7 +183,7 @@ func getContainerRestarts(c *client.Client, ns string, labelSelector labels.Sele return failedContainers, containerRestartNodes.List() } -var _ = Describe("DaemonRestart", func() { +var _ = Describe("DaemonRestart [Disruptive]", func() { framework := NewFramework("daemonrestart") rcName := "daemonrestart" + strconv.Itoa(numPods) + "-" + string(util.NewUUID()) diff --git a/test/e2e/etcd_failure.go b/test/e2e/etcd_failure.go index 166adf393aa..c2b161dc551 100644 --- a/test/e2e/etcd_failure.go +++ b/test/e2e/etcd_failure.go @@ -27,7 +27,7 @@ import ( . "github.com/onsi/gomega" ) -var _ = Describe("Etcd failure", func() { +var _ = Describe("Etcd failure [Disruptive]", func() { var skipped bool framework := NewFramework("etcd-failure") diff --git a/test/e2e/ingress.go b/test/e2e/ingress.go index 04574f85bbf..c304718c0a6 100644 --- a/test/e2e/ingress.go +++ b/test/e2e/ingress.go @@ -376,7 +376,7 @@ func (cont *IngressController) Cleanup(del bool) error { return fmt.Errorf(errMsg) } -var _ = Describe("GCE L7 LoadBalancer Controller", func() { +var _ = Describe("GCE L7 LoadBalancer Controller [Serial]", func() { // These variables are initialized after framework's beforeEach. var ns string var addonDir string diff --git a/test/e2e/kubelet_perf.go b/test/e2e/kubelet_perf.go index 43ddfa19507..d768eaf19c1 100644 --- a/test/e2e/kubelet_perf.go +++ b/test/e2e/kubelet_perf.go @@ -138,7 +138,7 @@ func verifyCPULimits(expected containersCPUSummary, actual nodesCPUSummary) { } } -var _ = Describe("Kubelet", func() { +var _ = Describe("Kubelet [Serial]", func() { var nodeNames sets.String framework := NewFramework("kubelet-perf") var rm *resourceMonitor diff --git a/test/e2e/monitor_resources.go b/test/e2e/monitor_resources.go index f10ae414aa6..780c5e58217 100644 --- a/test/e2e/monitor_resources.go +++ b/test/e2e/monitor_resources.go @@ -72,7 +72,7 @@ func computeAverage(sliceOfUsages []resourceUsagePerContainer) (result resourceU // 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("Resource usage of system containers", func() { +var _ = Describe("Resource usage of system containers [Serial]", func() { var c *client.Client BeforeEach(func() { var err error diff --git a/test/e2e/nodeoutofdisk.go b/test/e2e/nodeoutofdisk.go index 6a9cca5e64c..51518f2e3e3 100644 --- a/test/e2e/nodeoutofdisk.go +++ b/test/e2e/nodeoutofdisk.go @@ -63,7 +63,7 @@ const ( // choose that node to be node with index 1. // 7. Observe that the pod in pending status schedules on that node. // -var _ = Describe("NodeOutOfDisk", func() { +var _ = Describe("NodeOutOfDisk [Serial]", func() { var c *client.Client var unfilledNodeName, recoveredNodeName string framework := Framework{BaseName: "node-outofdisk"} diff --git a/test/e2e/reboot.go b/test/e2e/reboot.go index c4927b15e02..b63fe39fb48 100644 --- a/test/e2e/reboot.go +++ b/test/e2e/reboot.go @@ -44,7 +44,7 @@ const ( rebootPodReadyAgainTimeout = 5 * time.Minute ) -var _ = Describe("Reboot", func() { +var _ = Describe("Reboot [Disruptive]", func() { var f *Framework BeforeEach(func() { diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index 0d25c757104..6c71b01c824 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -388,7 +388,7 @@ func performTemporaryNetworkFailure(c *client.Client, ns, rcName string, replica // network traffic is unblocked in a deferred function } -var _ = Describe("Nodes", func() { +var _ = Describe("Nodes [Disruptive]", func() { framework := NewFramework("resize-nodes") var systemPodsNo int var c *client.Client diff --git a/test/e2e/scheduler_predicates.go b/test/e2e/scheduler_predicates.go index a2d72bbf88c..cffb681a6dc 100644 --- a/test/e2e/scheduler_predicates.go +++ b/test/e2e/scheduler_predicates.go @@ -173,7 +173,7 @@ func waitForStableCluster(c *client.Client) int { return len(scheduledPods) } -var _ = Describe("SchedulerPredicates", func() { +var _ = Describe("SchedulerPredicates [Serial]", func() { var c *client.Client var nodeList *api.NodeList var totalPodCapacity int64 diff --git a/test/e2e/service.go b/test/e2e/service.go index fc952308e80..ef9584ac1f2 100644 --- a/test/e2e/service.go +++ b/test/e2e/service.go @@ -257,7 +257,7 @@ var _ = Describe("Services", func() { expectNoError(stopServeHostnameService(c, ns, "service3")) }) - It("should work after restarting kube-proxy", func() { + It("should work after restarting kube-proxy [Disruptive]", func() { SkipUnlessProviderIs("gce", "gke") ns := f.Namespace.Name @@ -308,7 +308,7 @@ var _ = Describe("Services", func() { expectNoError(verifyServeHostnameServiceUp(c, host, podNames2, svc2IP, servicePort)) }) - It("should work after restarting apiserver", func() { + It("should work after restarting apiserver [Disruptive]", func() { // TODO: restartApiserver doesn't work in GKE - fix it and reenable this test. SkipUnlessProviderIs("gce")