From 901716d7ae0bb8887dcb1b7a945d9923be6af016 Mon Sep 17 00:00:00 2001
From: Long Wu Yuan <longwuyuan@gmail.com>
Date: Tue, 10 May 2022 14:19:43 +0530
Subject: [PATCH] replaced go get ginkgo with go install ginkgo for DIND
 environ (#8569)

---
 build/run-in-docker.sh  | 21 ++++++++++++++-------
 test/e2e-image/Makefile |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh
index d63bb656c..4adb7b3e1 100755
--- a/build/run-in-docker.sh
+++ b/build/run-in-docker.sh
@@ -62,18 +62,25 @@ else
   PLATFORM_FLAG=
 fi
 
-env && hostname && uname -a
+echo "..printing env & other vars to stdout"
+echo "HOSTNAME=`hostname`"
+uname -a
+env
 echo "DIND_ENABLED=$DOCKER_IN_DOCKER_ENABLED"
-echo "FLAGS=$FLAGS"
-echo "PLATFORM=$PLATFORM"
-echo "PLATFORM_FLAG=$PLATFORM_FLAG"
+echo "done..printing env & other vars to stdout"
 
 if [[ "$DOCKER_IN_DOCKER_ENABLED" == "true" ]]; then
-  echo "..reached DIND check TRUE block, inside run-in-docker.sh. Checking environ"
-  go get github.com/onsi/ginkgo/ginkgo@v1.16.4
+  echo "..reached DIND check TRUE block, inside run-in-docker.sh"
+  echo "FLAGS=$FLAGS"
+  go env
+  set -x
+  go install -mod=mod github.com/onsi/ginkgo/ginkgo@v1.16.4 
+  find / -type f -name ginkgo 2>/dev/null
+  which ginkgo
   /bin/bash -c "${FLAGS}"
+  set +x
 else
-  echo "..reached DIND check ELSE block, inside run-in-docker.sh. Checking environ"
+  echo "..reached DIND check ELSE block, inside run-in-docker.sh"
   docker run                                            \
     ${PLATFORM_FLAG} ${PLATFORM}                        \
     --tty                                               \
diff --git a/test/e2e-image/Makefile b/test/e2e-image/Makefile
index 0e28e091c..3a012a2df 100644
--- a/test/e2e-image/Makefile
+++ b/test/e2e-image/Makefile
@@ -3,7 +3,7 @@ DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 
 image:
 	echo "..entered Makefile in /test/e2e-image"
-	echo "..calling Make target <<e2e-test-binar>>y in /Makefile from inside /test/e2e-image/Makefile"
+	echo "..calling Make target <<e2e-test-binary>> in /Makefile from inside /test/e2e-image/Makefile"
 	make -C $(DIR)/../../ e2e-test-binary
 	echo "..done building e2e-test-binary from /test/e2e-image/Makefile"