Merge pull request #22892 from ixdy/verify-all

Auto commit by PR queue bot

Makefile

@@ -56,7 +56,6 @@ 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.

hack/update-godep-licenses.sh

@@ -116,7 +116,7 @@ process_content () {
                         -maxdepth ${find_maxdepth} -type f "${find_names[@]}"))
   done
   # Uniquely sort the array
-  IFS=$'\n' local_files=($(sort -u <<<"${local_files[*]-}"))
+  IFS=$'\n' local_files=($(LC_ALL=C sort -u <<<"${local_files[*]-}"))
   unset IFS
 
   for f in ${local_files[@]-}; do

hack/verify-all.sh

@@ -27,7 +27,6 @@ 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 {