Skip to content

Commit

Permalink
replaced go get ginkgo with go install ginkgo for DIND environ (#8569)
Browse files Browse the repository at this point in the history
  • Loading branch information
longwuyuan authored May 10, 2022
1 parent 7402d51 commit fc58e92
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 8 deletions.
21 changes: 14 additions & 7 deletions build/run-in-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
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/[email protected]
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 \
Expand Down
2 changes: 1 addition & 1 deletion test/e2e-image/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit fc58e92

Please sign in to comment.