github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Require at least one healthy startup pod in GCE Jenkins e2e tests 

Includes a small fix relative to e7547b97 to handle
$E2E_MIN_STARTUP_PODS being null.
pull/6/head
Jeff Grafton 2015-07-23 15:22:02 -07:00
parent cc326c714b
commit 4d45945b3b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/ginkgo-e2e.sh
View File

@ -100,5 +100,6 @@ export PATH=$(dirname "${e2e_test}"):"${PATH}"
--node-instance-group="${NODE_INSTANCE_GROUP:-}" \ --node-instance-group="${NODE_INSTANCE_GROUP:-}" \
--num-nodes="${NUM_MINIONS:-}" \ --num-nodes="${NUM_MINIONS:-}" \
--prefix="${KUBE_GCE_INSTANCE_PREFIX:-e2e}" \ --prefix="${KUBE_GCE_INSTANCE_PREFIX:-e2e}" \
${E2E_REPORT_DIR+"--report-dir=${E2E_REPORT_DIR}"} \ ${E2E_MIN_STARTUP_PODS:+"--minStartupPods=${E2E_MIN_STARTUP_PODS}"} \
${E2E_REPORT_DIR:+"--report-dir=${E2E_REPORT_DIR}"} \
"${@:-}" "${@:-}"

2
hack/jenkins/e2e.sh
View File

@ -67,6 +67,7 @@ E2E_OPT=${E2E_OPT:-""}
# Set environment variables shared for all of the GCE Jenkins projects. # Set environment variables shared for all of the GCE Jenkins projects.
if [[ ${JOB_NAME} =~ ^kubernetes-.*-gce ]]; then if [[ ${JOB_NAME} =~ ^kubernetes-.*-gce ]]; then
KUBERNETES_PROVIDER="gce" KUBERNETES_PROVIDER="gce"
: ${E2E_MIN_STARTUP_PODS:="1"}
: ${E2E_ZONE:="us-central1-f"} : ${E2E_ZONE:="us-central1-f"}
: ${MASTER_SIZE:="n1-standard-2"} : ${MASTER_SIZE:="n1-standard-2"}
: ${MINION_SIZE:="n1-standard-2"} : ${MINION_SIZE:="n1-standard-2"}
@ -272,6 +273,7 @@ export ZONE=${E2E_ZONE}
export KUBE_GKE_NETWORK=${E2E_NETWORK} export KUBE_GKE_NETWORK=${E2E_NETWORK}
# Shared cluster variables # Shared cluster variables
export E2E_MIN_STARTUP_PODS=${E2E_MIN_STARTUP_PODS:-}
export MASTER_SIZE=${MASTER_SIZE:-} export MASTER_SIZE=${MASTER_SIZE:-}
export MINION_SIZE=${MINION_SIZE:-} export MINION_SIZE=${MINION_SIZE:-}
export NUM_MINIONS=${NUM_MINIONS:-} export NUM_MINIONS=${NUM_MINIONS:-}