Merge pull request #13118 from ixdy/jenkins-configs

Use GCE defaults for per-PR Jenkins

Merge pull request #13118 from ixdy/jenkins-configs
ad16ca3c · Nikhil Jindal · c85912eb · 22cba0f8 · ad16ca3c
Commit ad16ca3c authored Aug 24, 2015 by Nikhil Jindal
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

e2e.sh hack/jenkins/e2e.sh +0 -4

No files found.
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -295,10 +295,6 @@ case ${JOB_NAME} in
    : ${KUBE_GCE_INSTANCE_PREFIX:="pull-e2e-${EXECUTOR_NUMBER}"}
    : ${KUBE_GCS_STAGING_PATH_SUFFIX:="-${EXECUTOR_NUMBER}"}
    : ${PROJECT:="kubernetes-jenkins-pull"}
-    # Override GCE defaults.
-    MASTER_SIZE="n1-standard-1"
-    MINION_SIZE="n1-standard-1"
-    NUM_MINIONS="2"
    ;;

  # Runs non-flaky tests on GCE on the release-latest branch,