From f9394b2ed17acefdddb8ebaa56d202e458890a28 Mon Sep 17 00:00:00 2001
From: Jintao Zhang <zhangjintao9020@gmail.com>
Date: Wed, 15 Nov 2023 01:11:59 +0800
Subject: [PATCH] chore(ci): easy to bump ginkgo's version

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
---
 Makefile                             | 2 +-
 build/run-in-docker.sh               | 4 ----
 images/test-runner/rootfs/Dockerfile | 4 +---
 test/e2e/run-chart-test.sh           | 3 ---
 test/e2e/run-kind-e2e.sh             | 4 ----
 tools/ginkgo.go                      | 7 +++++++
 6 files changed, 9 insertions(+), 15 deletions(-)
 create mode 100644 tools/ginkgo.go

diff --git a/Makefile b/Makefile
index cbda4dafb..f14045396 100644
--- a/Makefile
+++ b/Makefile
@@ -172,7 +172,7 @@ kind-e2e-chart-tests: ## Run helm chart e2e tests
 e2e-test-binary:  ## Build binary for e2e tests.
 	@build/run-in-docker.sh \
 		MAC_OS=$(MAC_OS) \
-		ginkgo build ./test/e2e
+		GOBIN=/tmp/bin go generate tools/ginkgo.go && /tmp/bin/ginkgo build ./test/e2e
 
 .PHONY: print-e2e-suite
 print-e2e-suite: e2e-test-binary ## Prints information about the suite of e2e tests.
diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh
index bec825291..453e9e8ad 100755
--- a/build/run-in-docker.sh
+++ b/build/run-in-docker.sh
@@ -86,10 +86,6 @@ USER=${USER:-nobody}
 if [[ "$DOCKER_IN_DOCKER_ENABLED" == "true" ]]; then
   echo "..reached DIND check TRUE block, inside run-in-docker.sh"
   echo "FLAGS=$FLAGS"
-  #go env
-  go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.13.0
-  find / -type f -name ginkgo 2>/dev/null
-  which ginkgo
   /bin/bash -c "${FLAGS}"
 else
   echo "Reached DIND check ELSE block, inside run-in-docker.sh"
diff --git a/images/test-runner/rootfs/Dockerfile b/images/test-runner/rootfs/Dockerfile
index 161b6caf4..536ed51b5 100644
--- a/images/test-runner/rootfs/Dockerfile
+++ b/images/test-runner/rootfs/Dockerfile
@@ -30,7 +30,6 @@ ARG CHART_TESTING_VERSION
 ARG HELM_VERSION
 ARG YAMALE_VERSION
 ARG YAML_LINT_VERSION
-ARG GINKGO_VERSION
 ARG GOLINT_VERSION
 
 
@@ -68,8 +67,7 @@ RUN apk update && apk upgrade && apk add --no-cache \
   tzdata \
   libc6-compat
 
-RUN go install -v github.com/onsi/ginkgo/v2/ginkgo@v${GINKGO_VERSION} \
-    && go install golang.org/x/lint/golint@${GOLINT_VERSION}
+RUN go install golang.org/x/lint/golint@${GOLINT_VERSION}
 
 RUN wget -qO /tmp/resty_cli.tgz \
   https://github.com/openresty/resty-cli/archive/v${RESTY_CLI_VERSION}.tar.gz \
diff --git a/test/e2e/run-chart-test.sh b/test/e2e/run-chart-test.sh
index 425d043e9..910d74103 100755
--- a/test/e2e/run-chart-test.sh
+++ b/test/e2e/run-chart-test.sh
@@ -77,9 +77,6 @@ if [ "${SKIP_CLUSTER_CREATION:-false}" = "false" ]; then
 fi
 
 if [ "${SKIP_IMAGE_CREATION:-false}" = "false" ]; then
-  if ! command -v ginkgo &> /dev/null; then
-    go install github.com/onsi/ginkgo/v2/ginkgo@v2.13.0
-  fi
   echo "[dev-env] building image"
   make -C ${DIR}/../../ clean-image build image
 fi
diff --git a/test/e2e/run-kind-e2e.sh b/test/e2e/run-kind-e2e.sh
index 5c4ba5c1e..2d1c3a6a4 100755
--- a/test/e2e/run-kind-e2e.sh
+++ b/test/e2e/run-kind-e2e.sh
@@ -95,10 +95,6 @@ if [ "${SKIP_INGRESS_IMAGE_CREATION}" = "false" ]; then
 fi
 
 if [ "${SKIP_E2E_IMAGE_CREATION}" = "false" ]; then
-  if ! command -v ginkgo &> /dev/null; then
-    go install github.com/onsi/ginkgo/v2/ginkgo@v2.13.0
-  fi
-
   echo "[dev-env] .. done building controller images"
   echo "[dev-env] now building e2e-image.."
   make -C "${DIR}"/../e2e-image image
diff --git a/tools/ginkgo.go b/tools/ginkgo.go
new file mode 100644
index 000000000..98b0f9f68
--- /dev/null
+++ b/tools/ginkgo.go
@@ -0,0 +1,7 @@
+package tools
+
+import (
+	_ "github.com/onsi/ginkgo/v2/ginkgo"
+)
+
+//go:generate go install github.com/onsi/ginkgo/v2/ginkgo