From 6ac427a5012c0c77820d10bfc0056b15e5c92183 Mon Sep 17 00:00:00 2001 From: Brad Erickson Date: Mon, 30 Nov 2015 14:52:48 -0800 Subject: [PATCH] Minion->Node rename: e2e.sh and resize_nodes.go GCE_FLAKY_TESTS --- hack/jenkins/e2e.sh | 2 +- test/e2e/resize_nodes.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 282b09cc357..de60e950c91 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -320,7 +320,7 @@ GCE_FLAKY_TESTS=( "GCE\sL7\sLoadBalancer\sController" # issue: #17518 "DaemonRestart\sController\sManager" # issue: #17829 "Resource\susage\sof\ssystem\scontainers" # issue: #13931 - "allows\sscheduling\sof\spods\son\sa\sminion\safter\sit\srejoins\sthe\scluster" # file: resize_nodes.go, issue: #17830 + "allows\sscheduling\sof\spods\son\sa\snode\safter\sit\srejoins\sthe\scluster" # file: resize_nodes.go, issue: #17830 "NodeOutOfDisk" # issue: 17687 ) diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index c4464a06a57..1e753e86b59 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -485,7 +485,7 @@ var _ = Describe("Nodes", func() { }) Describe("Network", func() { - Context("when a minion node becomes unreachable", func() { + Context("when a node becomes unreachable", func() { BeforeEach(func() { SkipUnlessProviderIs("gce", "gke", "aws") SkipUnlessNodeCountIsAtLeast(2) @@ -497,8 +497,8 @@ var _ = Describe("Nodes", func() { // 1. pods from a uncontactable nodes are rescheduled // 2. when a node joins the cluster, it can host new pods. // Factor out the cases into two separate tests. - It("[replication controller] recreates pods scheduled on the unreachable minion node "+ - "AND allows scheduling of pods on a minion after it rejoins the cluster", func() { + It("[replication controller] recreates pods scheduled on the unreachable node "+ + "AND allows scheduling of pods on a node after it rejoins the cluster", func() { // Create a replication controller for a service that serves its hostname. // The source for the Docker container kubernetes/serve_hostname is in contrib/for-demos/serve_hostname