Skip to content
This repository was archived by the owner on Feb 14, 2022. It is now read-only.

Commit 6c50f0c

Browse files
committed
make sure we install the correct version of ginkgo
Hoping to fix: Output from proc 3: flag provided but not defined: -ginkgo.timeout Usage of /e2e.test: -alsologtostderr log to standard error as well as files -ginkgo.dryRun If set, ginkgo will walk the test hierarchy without actually running anything. Best paired with -v. Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 14f03ec commit 6c50f0c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARG KUBERNETES_VERSION
3232
ENV GITCOMMIT=$GITCOMMIT VERSION=$VERSION BUILDTIME=$BUILDTIME IMAGE_REPO_PREFIX=$IMAGE_REPO_PREFIX KUBERNETES_VERSION=$KUBERNETES_VERSION
3333
ENV CGO_ENABLED=0
3434
RUN make bin/compose-controller bin/compose-controller.test e2e-binary bin/installer bin/api-server bin/api-server.test bin/e2e_benchmark
35-
RUN go get github.com/onsi/ginkgo/ginkgo
35+
RUN GO111MODULE=on go install github.com/onsi/ginkgo/ginkgo@v1.16.5
3636
RUN curl -fLO https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VERSION}/bin/linux/amd64/kubectl && \
3737
chmod +x ./kubectl && \
3838
mv ./kubectl /bin/kubectl

Dockerfile.buildkit

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARG KUBERNETES_VERSION
3232
ENV GITCOMMIT=$GITCOMMIT VERSION=$VERSION BUILDTIME=$BUILDTIME IMAGE_REPO_PREFIX=$IMAGE_REPO_PREFIX KUBERNETES_VERSION=$KUBERNETES_VERSION
3333
ENV CGO_ENABLED=0
3434
RUN --mount=target=/root/.cache,type=cache make bin/compose-controller bin/compose-controller.test e2e-binary bin/installer bin/api-server bin/api-server.test bin/e2e_benchmark
35-
RUN go get github.com/onsi/ginkgo/ginkgo
35+
RUN GO111MODULE=on go install github.com/onsi/ginkgo/ginkgo@v1.16.5
3636
RUN curl -fLO https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VERSION}/bin/linux/amd64/kubectl && \
3737
chmod +x ./kubectl && \
3838
mv ./kubectl /bin/kubectl

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ check-licenses: ## Check the licenses for our dependencies
7575
$(GOPATH)/bin/wwhrd check
7676

7777
install-ginkgo:
78-
go get -u github.com/onsi/ginkgo/ginkgo
78+
GO111MODULE=on go install github.com/onsi/ginkgo/ginkgo@v1.16.5
7979
go get -u github.com/onsi/gomega/...
8080

8181
e2e: ## Run the e2e tests

0 commit comments

Comments
 (0)