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

Commit

Permalink
make sure we install the correct version of ginkgo
Browse files Browse the repository at this point in the history 
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]>
  • Loading branch information
@thaJeztah
thaJeztah committed Jan 28, 2022
1 parent 14f03ec commit 6c50f0c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ARG KUBERNETES_VERSION
ENV GITCOMMIT=$GITCOMMIT VERSION=$VERSION BUILDTIME=$BUILDTIME IMAGE_REPO_PREFIX=$IMAGE_REPO_PREFIX KUBERNETES_VERSION=$KUBERNETES_VERSION
ENV CGO_ENABLED=0
RUN make bin/compose-controller bin/compose-controller.test e2e-binary bin/installer bin/api-server bin/api-server.test bin/e2e_benchmark
RUN go get github.com/onsi/ginkgo/ginkgo
RUN GO111MODULE=on go install github.com/onsi/ginkgo/ginkgo@v1.16.5
RUN curl -fLO https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VERSION}/bin/linux/amd64/kubectl && \
chmod +x ./kubectl && \
mv ./kubectl /bin/kubectl
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.buildkit
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ARG KUBERNETES_VERSION
ENV GITCOMMIT=$GITCOMMIT VERSION=$VERSION BUILDTIME=$BUILDTIME IMAGE_REPO_PREFIX=$IMAGE_REPO_PREFIX KUBERNETES_VERSION=$KUBERNETES_VERSION
ENV CGO_ENABLED=0
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
RUN go get github.com/onsi/ginkgo/ginkgo
RUN GO111MODULE=on go install github.com/onsi/ginkgo/ginkgo@v1.16.5
RUN curl -fLO https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VERSION}/bin/linux/amd64/kubectl && \
chmod +x ./kubectl && \
mv ./kubectl /bin/kubectl
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ check-licenses: ## Check the licenses for our dependencies
$(GOPATH)/bin/wwhrd check

install-ginkgo:
go get -u github.com/onsi/ginkgo/ginkgo
GO111MODULE=on go install github.com/onsi/ginkgo/ginkgo@v1.16.5
go get -u github.com/onsi/gomega/...

e2e: ## Run the e2e tests
Expand Down

0 comments on commit 6c50f0c

Please sign in to comment.