From e67667f1b5db77546e8b710a04b73b5e6e76337c Mon Sep 17 00:00:00 2001 From: Brad Erickson Date: Mon, 30 Nov 2015 14:31:32 -0800 Subject: [PATCH] Minion->Node rename: comments and vars for e2e.go and e2e.sh --- hack/e2e.go | 8 ++++---- hack/jenkins/e2e.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hack/e2e.go b/hack/e2e.go index 53f19cbdded..39fa03b76d2 100644 --- a/hack/e2e.go +++ b/hack/e2e.go @@ -60,7 +60,7 @@ const ( downloadDirName = "_output/downloads" tarDirName = "server" tempDirName = "upgrade-e2e-temp-dir" - minMinionCount = 2 + minNodeCount = 2 ) var ( @@ -185,7 +185,7 @@ func Up() bool { // Ensure that the cluster is large engough to run the e2e tests. func ValidateClusterSize() { - // Check that there are at least minMinionCount minions running + // Check that there are at least minNodeCount nodes running cmd := exec.Command(path.Join(*root, "hack/e2e-internal/e2e-cluster-size.sh")) if *verbose { cmd.Stderr = os.Stderr @@ -200,8 +200,8 @@ func ValidateClusterSize() { log.Fatalf("Could not count number of nodes to validate cluster size (%s)", err) } - if numNodes < minMinionCount { - log.Fatalf("Cluster size (%d) is too small to run e2e tests. %d Minions are required.", numNodes, minMinionCount) + if numNodes < minNodeCount { + log.Fatalf("Cluster size (%d) is too small to run e2e tests. %d Nodes are required.", numNodes, minNodeCount) } } diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 66bd0a6776b..282b09cc357 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -1229,7 +1229,7 @@ case ${JOB_NAME} in NUM_NODES="11" MASTER_SIZE="n1-standard-4" NODE_SIZE="n1-standard-8" # Note: can fit about 17 hollow nodes per core - # so NUM_NODES x cores_per_minion should + # so NUM_NODES x cores_per_node should # be set accordingly. KUBE_GCE_INSTANCE_PREFIX="kubemark1000" E2E_ZONE="asia-east1-a"