Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ignore console-log.txt when checking for empty workspace in e2e.sh #18737

Merged
merged 1 commit into from Dec 16, 2015
Merged

Ignore console-log.txt when checking for empty workspace in e2e.sh #18737

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions hack/jenkins/e2e.sh
View file
Open in desktop
Expand Up @@ -934,8 +934,14 @@ 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 . | 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

Expand Down