From 9bb83ce7cda0f918acf0a6f96b1485cff842bb07 Mon Sep 17 00:00:00 2001 From: Joe Finney Date: Tue, 15 Dec 2015 15:34:10 -0800 Subject: [PATCH] Ignore console-log.txt when checking for empty workspace. --- hack/jenkins/e2e.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index a2503776ac1..3e01824d94c 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -1145,8 +1145,13 @@ if [[ "${E2E_UP,,}" == "true" || "${JENKINS_FORCE_GET_TARS:-}" =~ ^[yY]$ ]]; the # Otherwise, we want a completely empty directory. if [[ "${JENKINS_FORCE_GET_TARS:-}" =~ ^[yY]$ ]]; then rm -rf kubernetes* - elif [[ $(find . -not -path './.config*' | wc -l) != 1 ]]; then - echo $PWD not empty, bailing! + # .config and its children are created by the gcloud call that we use to + # get the GCE service account. + # console-log.txt is created by Jenkins, but is usually not flushed out + # this early in the script. + elif [[ $(find . -not -path "./.config*" -not -name "console-log.txt" \ + | wc -l) != 1 ]]; then + echo "${PWD} not empty, bailing!" find . exit 1 fi