Fix godep-save by ignoring cmd/cluster-capacity and cmd/service-catal…

…og dirs.
openshift · Jun 21, 2017 · 3ca7432 · 3ca7432
1 parent df9c0ed
commit 3ca7432
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/hack/godep-save.sh b/hack/godep-save.sh
@@ -52,7 +52,6 @@ REQUIRED_BINS=(
   "k8s.io/kubernetes/test/e2e/generated"
   "github.com/onsi/ginkgo/ginkgo"
   "github.com/jteeuwen/go-bindata/go-bindata"
-  "./..."
 )
 
 TMPGOPATH=`mktemp -d`
@@ -164,8 +163,13 @@ fork-with-fake-packages github.com/docker/docker \
 # kubernetes tests, we have to extract the missing test dependencies and run godep-save again
 # until we converge. Because we rsync kubernetes itself above, two iterations should be enough.
 MISSING_TEST_DEPS=""
+ALL_DIRS="$(os::util::list_go_src_files | cut -d '/' -f 1-2 | grep -v ".go$" | grep -v "^./cmd" | LC_ALL=C sort -u)"
+ALL_DIRS+=" $(os::util::list_go_src_files | grep "^./cmd/"| cut -d '/' -f 1-3 | grep -v ".go$" | LC_ALL=C sort -u)"
+for dir in ${ALL_DIRS}; do
+ REQUIRED_ALL_DIRS+=" ${dir}/..."
+done
 while true; do
-  godep-save -t "${REQUIRED_BINS[@]}" ${MISSING_TEST_DEPS}
+  godep-save -t "${REQUIRED_BINS[@]}" ${REQUIRED_ALL_DIRS} ${MISSING_TEST_DEPS}
   NEW_MISSING_TEST_DEPS="$(missing-test-deps)"
   if [ -z "${NEW_MISSING_TEST_DEPS}" ]; then
     break