Skip to content

Commit

Permalink
bumped ginkgo to v2.9.0 (#9722)
Browse files Browse the repository at this point in the history
  • Loading branch information
longwuyuan authored Mar 14, 2023
1 parent e2d076c commit 520384b
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build/run-in-docker.sh
Original file line number Diff line number Diff line change
@@ -87,7 +87,7 @@ 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.6.1
go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.9.0
find / -type f -name ginkgo 2>/dev/null
which ginkgo
/bin/bash -c "${FLAGS}"
2 changes: 1 addition & 1 deletion images/test-runner/rootfs/Dockerfile
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH

RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"

RUN go install github.com/onsi/ginkgo/v2/ginkgo@v2.6.1 && go install golang.org/x/lint/golint@latest
RUN go install github.com/onsi/ginkgo/v2/ginkgo@v2.9.0 && go install golang.org/x/lint/golint@latest

ARG RESTY_CLI_VERSION
ARG RESTY_CLI_SHA
2 changes: 1 addition & 1 deletion test/e2e/run-chart-test.sh
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ fi

if [ "${SKIP_IMAGE_CREATION:-false}" = "false" ]; then
if ! command -v ginkgo &> /dev/null; then
go install github.com/onsi/ginkgo/v2/ginkgo@v2.6.1
go install github.com/onsi/ginkgo/v2/ginkgo@v2.9.0
fi
echo "[dev-env] building image"
make -C ${DIR}/../../ clean-image build image
4 changes: 2 additions & 2 deletions test/e2e/run-kind-e2e.sh
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ fi

if [ "${SKIP_E2E_IMAGE_CREATION}" = "false" ]; then
if ! command -v ginkgo &> /dev/null; then
go install github.com/onsi/ginkgo/v2/ginkgo@v2.6.1
go install github.com/onsi/ginkgo/v2/ginkgo@v2.9.0
fi

echo "[dev-env] .. done building controller images"
@@ -112,4 +112,4 @@ echo "[dev-env] copying docker images to cluster..."
kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes="${KIND_WORKERS}" nginx-ingress-controller:e2e
kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes="${KIND_WORKERS}" "${REGISTRY}"/controller:"${TAG}"
echo "[dev-env] running e2e tests..."
make -C "${DIR}"/../../ e2e-test
make -C "${DIR}"/../../ e2e-test

0 comments on commit 520384b

Please sign in to comment.