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.
gosuri · Oct 19, 2015 · 4cafa3e · 4cafa3e
1 parent 4d18186
commit 4cafa3e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -36,6 +36,7 @@ find_files() {
       \( \
         -wholename './output' \
         -o -wholename './_output' \
+        -o -wholename './_gopath' \
         -o -wholename './release' \
         -o -wholename './target' \
         -o -wholename '*/third_party/*' \