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

Merge pull request #16329 from ixdy/resource-check 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-10-29 02:02:36 -07:00
parent d5be3635e5 253254fc80
commit 1ef85cd78c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hack/jenkins/e2e.sh
View File

@ -509,7 +509,7 @@ case ${JOB_NAME} in
: ${E2E_CLUSTER_NAME:="jkns-gke-e2e-test"}
: ${E2E_NETWORK:="e2e-gke-test"}
: ${JENKINS_PUBLISHED_VERSION:="release/latest"}
: ${PROJECT:="k8s-jkns-e2e-gke-ci"}
: ${PROJECT:="k8s-jkns-e2e-gke-test"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \
${GKE_REQUIRED_SKIP_TESTS[@]:+${GKE_REQUIRED_SKIP_TESTS[@]}} \
@ -540,9 +540,9 @@ case ${JOB_NAME} in
: ${CLOUDSDK_BUCKET:="gs://cloud-sdk-build/testing/staging"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="jkns-gke-e2e-ci-reboot"}
: ${E2E_NETWORK:="e2e-gke-ci"}
: ${E2E_NETWORK:="e2e-gke-ci-reboot"}
: ${E2E_SET_CLUSTER_API_VERSION:=y}
: ${PROJECT:="k8s-jkns-e2e-gke-ci"}
: ${PROJECT:="k8s-jkns-e2e-gke-ci-reboot"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \
${GKE_REQUIRED_SKIP_TESTS[@]:+${GKE_REQUIRED_SKIP_TESTS[@]}} \