Commit 4cafa3e9 authored by Jeff Grafton's avatar Jeff Grafton

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.
parent 4d18186a
...@@ -33,6 +33,7 @@ find_files() { ...@@ -33,6 +33,7 @@ find_files() {
\( \ \( \
-wholename './output' \ -wholename './output' \
-o -wholename './_output' \ -o -wholename './_output' \
-o -wholename './_gopath' \
-o -wholename './release' \ -o -wholename './release' \
-o -wholename './target' \ -o -wholename './target' \
-o -wholename '*/third_party/*' \ -o -wholename '*/third_party/*' \
......
...@@ -95,7 +95,7 @@ def file_passes(filename, refs, regexs): ...@@ -95,7 +95,7 @@ def file_passes(filename, refs, regexs):
def file_extension(filename): def file_extension(filename):
return os.path.splitext(filename)[1].split(".")[-1].lower() 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): def normalize_files(files):
newfiles = [] newfiles = []
for pathname in files: for pathname in files:
......
...@@ -241,11 +241,12 @@ kube::util::gen-analytics() { ...@@ -241,11 +241,12 @@ kube::util::gen-analytics() {
else else
dir="${path}" dir="${path}"
fi 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. # docs are autogenerated by gendocs.
mdfiles=($( find "${dir}" -name "*.md" -type f \ mdfiles=($( find "${dir}" -name "*.md" -type f \
-not -path "${path}/Godeps/*" \ -not -path "${path}/Godeps/*" \
-not -path "${path}/third_party/*" \ -not -path "${path}/third_party/*" \
-not -path "${path}/_gopath/*" \
-not -path "${path}/_output/*" \ -not -path "${path}/_output/*" \
-not -path "${path}/docs/user-guide/kubectl/kubectl*" )) -not -path "${path}/docs/user-guide/kubectl/kubectl*" ))
for f in "${mdfiles[@]}"; do for f in "${mdfiles[@]}"; do
......
...@@ -36,6 +36,7 @@ find_files() { ...@@ -36,6 +36,7 @@ find_files() {
\( \ \( \
-wholename './output' \ -wholename './output' \
-o -wholename './_output' \ -o -wholename './_output' \
-o -wholename './_gopath' \
-o -wholename './release' \ -o -wholename './release' \
-o -wholename './target' \ -o -wholename './target' \
-o -wholename '*/third_party/*' \ -o -wholename '*/third_party/*' \
......
...@@ -55,6 +55,8 @@ def get_all_files(rootdir): ...@@ -55,6 +55,8 @@ def get_all_files(rootdir):
# don't visit certain dirs # don't visit certain dirs
if 'Godeps' in dirs: if 'Godeps' in dirs:
dirs.remove('Godeps') dirs.remove('Godeps')
if '_gopath' in dirs:
dirs.remove('_gopath')
if 'third_party' in dirs: if 'third_party' in dirs:
dirs.remove('third_party') dirs.remove('third_party')
if '.git' in dirs: if '.git' in dirs:
...@@ -77,7 +79,7 @@ def get_all_files(rootdir): ...@@ -77,7 +79,7 @@ def get_all_files(rootdir):
def normalize_files(rootdir, files): def normalize_files(rootdir, files):
newfiles = [] 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: for f in files:
if any(x in f for x in a): if any(x in f for x in a):
continue continue
......
...@@ -36,6 +36,7 @@ find_files() { ...@@ -36,6 +36,7 @@ find_files() {
\( \ \( \
-wholename './output' \ -wholename './output' \
-o -wholename './_output' \ -o -wholename './_output' \
-o -wholename './_gopath' \
-o -wholename './release' \ -o -wholename './release' \
-o -wholename './target' \ -o -wholename './target' \
-o -wholename '*/third_party/*' \ -o -wholename '*/third_party/*' \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment