From 3d1ee74415598c8dd99e72b6c42f417a9b60c66c Mon Sep 17 00:00:00 2001 From: Matt Moore Date: Thu, 13 Feb 2020 10:00:37 -0800 Subject: [PATCH] Auto-update dependencies (#1090) Produced via: `dep ensure -update knative.dev/test-infra` /assign n3wscott /cc n3wscott --- Gopkg.lock | 4 ++-- vendor/knative.dev/test-infra/scripts/e2e-tests.sh | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index a0f0e2a31..eb55ee4fc 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1323,14 +1323,14 @@ [[projects]] branch = "master" - digest = "1:d2545cd71ef3604f5d2d792e569c6e3a4df31e336d76e709b0b8bac759c0faf7" + digest = "1:691951c6805590983ccea7c6dbca360bcb58af5f4d60f75af9499903bb3039e9" name = "knative.dev/test-infra" packages = [ "scripts", "tools/dep-collector", ] pruneopts = "UT" - revision = "c7c50ccd8082344a5f8ea85a5ae8de59308d325c" + revision = "279d938f5e19db2550bea7f71f4cdb97e0d84128" [[projects]] digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" diff --git a/vendor/knative.dev/test-infra/scripts/e2e-tests.sh b/vendor/knative.dev/test-infra/scripts/e2e-tests.sh index f49fdf706..a78920dcc 100755 --- a/vendor/knative.dev/test-infra/scripts/e2e-tests.sh +++ b/vendor/knative.dev/test-infra/scripts/e2e-tests.sh @@ -231,9 +231,12 @@ function create_test_cluster() { [[ -n "${GCP_PROJECT}" ]] && test_cmd_args+=" --gcp-project ${GCP_PROJECT}" [[ -n "${E2E_SCRIPT_CUSTOM_FLAGS[@]}" ]] && test_cmd_args+=" ${E2E_SCRIPT_CUSTOM_FLAGS[@]}" local extra_flags=() - if (( IS_BOSKOS )); then # Add arbitrary duration, wait for Boskos projects acquisition before error out + if (( IS_BOSKOS )); then + # Add arbitrary duration, wait for Boskos projects acquisition before error out extra_flags+=(--boskos-wait-duration=20m) - else # Only let kubetest tear down the cluster if not using Boskos, it's done by Janitor if using Boskos + elif (( ! SKIP_TEARDOWNS )); then + # Only let kubetest tear down the cluster if not using Boskos and teardowns are not expected to be skipped, + # it's done by Janitor if using Boskos extra_flags+=(--down) fi