Merge pull request kubernetes#22844 from ixdy/verify-all

Disable verify-godep-licenses.sh in hack/verify-all.sh
abutcher · Mar 11, 2016 · 62607be · 62607be
2 parents 54e97c7 + 991f744
commit 62607be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -56,6 +56,7 @@ all:
 #   make verify BRANCH=branch_x
 verify:
 	KUBE_VERIFY_GIT_BRANCH=$(BRANCH) hack/verify-all.sh -v
+	hack/verify-godep-licenses.sh $(BRANCH)  # Remove this after fixing issue #22843
 .PHONY: verify
 
 # Build and run tests.

diff --git a/hack/verify-all.sh b/hack/verify-all.sh
@@ -27,6 +27,7 @@ SILENT=true
 EXCLUDED_CHECKS=(
   "verify-linkcheck.sh"  # runs in separate Jenkins job once per day due to high network usage
   "verify-generated-protobuf.sh"  # TODO(smarterclayton) add when protobuf is part of direct generation
+  "verify-godep-licenses.sh"  # Broken on Jenkins, issue #22843
   )
 
 function is-excluded {