Merge pull request #49043 from zmerlynn/allow-external-node-instance-group

Automatic merge from submit-queue (batch tested with PRs 49043, 49001, 49057, 49066, 48102) cluster/gke: If NODE_INSTANCE_GROUP is set, don't execute any bash Transitional part of kubernetes/test-infra#3307, should be eliminated by kubernetes/test-infra#3330: Allow NODE_INSTANCE_GROUP to be set externally from `hack/ginkgo-e2e.sh`, which eliminates any cluster/gke use if KUBERNETES_CONFORMANCE_PROVIDER is set to `gke`. ```release-note NONE ```

Merge pull request #49043 from zmerlynn/allow-external-node-instance-group
c8fb1863 · Kubernetes Submit Queue · GitHub · 013d37d8 · 3a2e9d51 · c8fb1863
Commit c8fb1863 authored Jul 17, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

ginkgo-e2e.sh hack/ginkgo-e2e.sh +4 -3

No files found.
--- a/hack/ginkgo-e2e.sh
+++ b/hack/ginkgo-e2e.sh
@@ -76,8 +76,6 @@ fi

 if [[ -n "${NODE_INSTANCE_PREFIX:-}" ]]; then
  NODE_INSTANCE_GROUP="${NODE_INSTANCE_PREFIX}-group"
-else
-  NODE_INSTANCE_GROUP=""
 fi

 if [[ "${KUBERNETES_PROVIDER}" == "gce" ]]; then
@@ -93,7 +91,10 @@ if [[ "${KUBERNETES_PROVIDER}" == "gce" ]]; then
  done
 fi

-if [[ "${KUBERNETES_PROVIDER}" == "gke" ]]; then
+# TODO(kubernetes/test-infra#3330): Allow NODE_INSTANCE_GROUP to be
+# set before we get here, which eliminates any cluster/gke use if
+# KUBERNETES_CONFORMANCE_PROVIDER is set to "gke".
+if [[ -z "${NODE_INSTANCE_GROUP:-}" ]] && [[ "${KUBERNETES_PROVIDER}" == "gke" ]]; then
  detect-node-instance-groups
  NODE_INSTANCE_GROUP=$(kube::util::join , "${NODE_INSTANCE_GROUPS[@]}")
 fi