From 4cafa3e92d607b089a8e50237e4593ef2afd8e4f Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Fri, 25 Sep 2015 15:01:59 -0700 Subject: [PATCH] Ignore _gopath in verify scripts The _gopath directory is used in Jenkins to install extra dependencies, and any files in it should be ignored by the various verification scripts. --- hack/after-build/verify-description.sh | 1 + hack/boilerplate/boilerplate.py | 2 +- hack/lib/util.sh | 3 ++- hack/update-gofmt.sh | 1 + hack/verify-flags-underscore.py | 4 +++- hack/verify-gofmt.sh | 1 + 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/hack/after-build/verify-description.sh b/hack/after-build/verify-description.sh index 3e2bc051faf6e..183cffeb63ed2 100755 --- a/hack/after-build/verify-description.sh +++ b/hack/after-build/verify-description.sh @@ -33,6 +33,7 @@ find_files() { \( \ -wholename './output' \ -o -wholename './_output' \ + -o -wholename './_gopath' \ -o -wholename './release' \ -o -wholename './target' \ -o -wholename '*/third_party/*' \ diff --git a/hack/boilerplate/boilerplate.py b/hack/boilerplate/boilerplate.py index 7c788f54d0a77..f662640623ca9 100755 --- a/hack/boilerplate/boilerplate.py +++ b/hack/boilerplate/boilerplate.py @@ -95,7 +95,7 @@ def file_passes(filename, refs, regexs): def file_extension(filename): return os.path.splitext(filename)[1].split(".")[-1].lower() -skipped_dirs = ['Godeps', 'third_party', '_output', '.git'] +skipped_dirs = ['Godeps', 'third_party', '_gopath', '_output', '.git'] def normalize_files(files): newfiles = [] for pathname in files: diff --git a/hack/lib/util.sh b/hack/lib/util.sh index fc7c050277fca..9c2dfa2f3d0d7 100755 --- a/hack/lib/util.sh +++ b/hack/lib/util.sh @@ -241,11 +241,12 @@ kube::util::gen-analytics() { else dir="${path}" fi - # We don't touch files in Godeps|third_party, and the kubectl + # We don't touch files in Godeps|third_party|_gopath, and the kubectl # docs are autogenerated by gendocs. mdfiles=($( find "${dir}" -name "*.md" -type f \ -not -path "${path}/Godeps/*" \ -not -path "${path}/third_party/*" \ + -not -path "${path}/_gopath/*" \ -not -path "${path}/_output/*" \ -not -path "${path}/docs/user-guide/kubectl/kubectl*" )) for f in "${mdfiles[@]}"; do diff --git a/hack/update-gofmt.sh b/hack/update-gofmt.sh index 6f7727de83add..4db637c00bcaf 100755 --- a/hack/update-gofmt.sh +++ b/hack/update-gofmt.sh @@ -36,6 +36,7 @@ find_files() { \( \ -wholename './output' \ -o -wholename './_output' \ + -o -wholename './_gopath' \ -o -wholename './release' \ -o -wholename './target' \ -o -wholename '*/third_party/*' \ diff --git a/hack/verify-flags-underscore.py b/hack/verify-flags-underscore.py index 8b11d8da36141..bc61a07208f85 100755 --- a/hack/verify-flags-underscore.py +++ b/hack/verify-flags-underscore.py @@ -55,6 +55,8 @@ def get_all_files(rootdir): # don't visit certain dirs if 'Godeps' in dirs: dirs.remove('Godeps') + if '_gopath' in dirs: + dirs.remove('_gopath') if 'third_party' in dirs: dirs.remove('third_party') if '.git' in dirs: @@ -77,7 +79,7 @@ def get_all_files(rootdir): def normalize_files(rootdir, files): newfiles = [] - a = ['Godeps', 'third_party', 'exceptions.txt', 'known-flags.txt'] + a = ['Godeps', '_gopath', 'third_party', '.git', 'exceptions.txt', 'known-flags.txt'] for f in files: if any(x in f for x in a): continue diff --git a/hack/verify-gofmt.sh b/hack/verify-gofmt.sh index 1703fc35dfc68..5f1e6eb3575c3 100755 --- a/hack/verify-gofmt.sh +++ b/hack/verify-gofmt.sh @@ -36,6 +36,7 @@ find_files() { \( \ -wholename './output' \ -o -wholename './_output' \ + -o -wholename './_gopath' \ -o -wholename './release' \ -o -wholename './target' \ -o -wholename '*/third_party/*' \