DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replaced go get ginkgo with go install ginkgo for DIND environ (#8569)

Browse source
This commit is contained in:
Long Wu Yuan 2022-05-10 14:19:43 +05:30 committed by GitHub
parent 7402d51a02
commit fc58e92b39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
build/run-in-docker.sh
View file

@ -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 \

2
test/e2e-image/Makefile
View file

@ -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"