Skip to content

K
k3s
Commit a5080aab authored by Vish Kannan's avatar Vish Kannan
Browse files
Options

Merge pull request #11777 from ixdy/min-startup-pods-gce-jenkins

Require at least one healthy startup pod in GCE Jenkins e2e tests
parents cc326c71 4d45945b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
hack/ginkgo-e2e.sh
View file @ a5080aab
...@@ -100,5 +100,6 @@ export PATH=$(dirname "${e2e_test}"):"${PATH}" ...@@ -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}"} \
"${@:-}" "${@:-}"
hack/jenkins/e2e.sh
View file @ a5080aab
...@@ -67,6 +67,7 @@ E2E_OPT=${E2E_OPT:-""} ...@@ -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} ...@@ -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:-}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment