Merge pull request #15548 from gmarek/fix-kubemark

hack/jenkins/e2e.sh

@@ -833,6 +833,7 @@ case ${JOB_NAME} in
     : ${E2E_TEST:="false"}
     : ${USE_KUBEMARK:="true"}
     # Override defaults to be indpendent from GCE defaults and set kubemark parameters
+    KUBE_GCE_INSTANCE_PREFIX="kubemark100"
     NUM_MINIONS="10"
     MASTER_SIZE="n1-standard-2"
     MINION_SIZE="n1-standard-1"
@@ -856,6 +857,7 @@ case ${JOB_NAME} in
     MINION_SIZE="n1-standard-8"   # Note: can fit about 17 hollow nodes per core
     #                                     so NUM_MINIONS x cores_per_minion should
     #                                     be set accordingly.
+    KUBE_GCE_INSTANCE_PREFIX="kubemark1000"
     E2E_ZONE="asia-east1-a"
     KUBEMARK_MASTER_SIZE="n1-standard-16"
     KUBEMARK_NUM_MINIONS="1000"
@@ -1079,7 +1081,7 @@ if [[ "${USE_KUBEMARK:-}" == "true" ]]; then
   NUM_MINIONS=${KUBEMARK_NUM_MINIONS:-$NUM_MINIONS}
   MASTER_SIZE=${KUBEMARK_MASTER_SIZE:-$MASTER_SIZE}
   ./test/kubemark/start-kubemark.sh
-  ./test/kubemark/run-scalability-test.sh && exitcode=0 || exitcode=$?
+  ./test/kubemark/run-e2e-tests.sh && exitcode=0 || exitcode=$?
   ./test/kubemark/stop-kubemark.sh
   NUM_MINIONS=${NUM_MINIONS_BKP}
   MASTER_SIZE=${MASTER_SIZE_BKP}

test/kubemark/run-scalability-test.sh → test/kubemark/run-e2e-tests.sh

@@ -33,4 +33,10 @@ export KUBE_MASTER_URL="https://${KUBE_MASTER_IP}"
 export KUBECONFIG="${ABSOLUTE_ROOT}/test/kubemark/kubeconfig.loc"
 export E2E_MIN_STARTUP_PODS=0
 
-${KUBE_ROOT}/hack/ginkgo-e2e.sh --e2e-verify-service-account=false --ginkgo.focus="should\sallow\sstarting\s30\spods\sper\snode"
+if [ -z "$@" ]; then
+	ARGS="--ginkgo.focus=\"should\sallow\sstarting\s30\spods\sper\snode\""
+else
+	ARGS=$@
+fi
+
+${KUBE_ROOT}/hack/ginkgo-e2e.sh --e2e-verify-service-account=false $ARGS

test/kubemark/stop-kubemark.sh

@@ -19,10 +19,11 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
 
 source "${KUBE_ROOT}/cluster/kubemark/config-default.sh"
 source "${KUBE_ROOT}/cluster/kubemark/util.sh"
+source "${KUBE_ROOT}/cluster/kube-env.sh"
 
 detect-project &> /dev/null
 
-MASTER_NAME="${INSTANCE_PREFIX:-"default"}-kubemark-master"
+MASTER_NAME="${INSTANCE_PREFIX}-kubemark-master"
 
 kubectl delete -f ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json &> /dev/null || true
 kubectl delete -f ${KUBE_ROOT}/test/kubemark/kubemark-ns.json &> /dev/null || true
@@ -32,10 +33,13 @@ gcloud compute instances delete "${MASTER_NAME}" \
     --quiet \
     --zone "${ZONE}" || true
 
-gcloud compute disks delete \
+gcloud compute disks delete "${MASTER_NAME}"-pd \
       --project "${PROJECT}" \
       --quiet \
-      --zone "${ZONE}" \
-      "${MASTER_NAME}"-pd || true
+      --zone "${ZONE}" \ || true
+
+gcloud compute firewall-rules delete "${INSTANCE_PREFIX}-kubemark-master-https" \
+	  --project "${PROJECT}" \
+	  --quiet || true
 
 rm -rf "${KUBE_ROOT}/test/kubemark/kubeconfig.loc" &> /dev/null || true