diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 8070646..48884f0 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -49,12 +49,6 @@ jobs: earthly -P +iso export ISO=$PWD/build/challenger.iso - go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo - go get github.com/onsi/gomega/... - go get github.com/onsi/ginkgo/v2/ginkgo/internal@v2.7.1 - go get github.com/onsi/ginkgo/v2/ginkgo/generators@v2.7.1 - go get github.com/onsi/ginkgo/v2/ginkgo/labels@v2.7.1 - # Configure earthly to use the docker mirror in CI # https://docs.earthly.dev/ci-integration/pull-through-cache#configuring-earthly-to-use-the-cache cat << EOF > ~/.earthly/config.yml diff --git a/Earthfile b/Earthfile index 5b0a0c5..c771fe1 100644 --- a/Earthfile +++ b/Earthfile @@ -50,14 +50,8 @@ test: COPY go.mod go.sum ./ RUN go mod download && go mod verify - RUN go get github.com/onsi/gomega/... - RUN go get github.com/onsi/ginkgo/v2/ginkgo/internal@v2.1.4 - RUN go get github.com/onsi/ginkgo/v2/ginkgo/generators@v2.1.4 - RUN go get github.com/onsi/ginkgo/v2/ginkgo/labels@v2.1.4 - RUN go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo - COPY . /work - RUN PATH=$PATH:$GOPATH/bin ginkgo run --covermode=atomic --coverprofile=coverage.out -p -r pkg/challenger cmd/discovery/client + RUN go run github.com/onsi/ginkgo/v2/ginkgo run --covermode=atomic --coverprofile=coverage.out -p -r pkg/challenger cmd/discovery/client SAVE ARTIFACT coverage.out AS LOCAL coverage.out # Generic targets @@ -87,12 +81,6 @@ e2e-tests-image: COPY . /test WORKDIR /test - RUN go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo - RUN go get github.com/onsi/gomega/... - RUN go get github.com/onsi/ginkgo/v2/ginkgo/internal@v2.7.1 - RUN go get github.com/onsi/ginkgo/v2/ginkgo/generators@v2.7.1 - RUN go get github.com/onsi/ginkgo/v2/ginkgo/labels@v2.7.1 - IF [ -e /test/build/kairos.iso ] ENV ISO=/test/build/kairos.iso ELSE diff --git a/scripts/e2e-tests.sh b/scripts/e2e-tests.sh index 34c9608..cc6cdf9 100755 --- a/scripts/e2e-tests.sh +++ b/scripts/e2e-tests.sh @@ -59,4 +59,4 @@ kubectl apply -k "$SCRIPT_DIR/../tests/assets/" # https://stackoverflow.com/a/6752280 export KMS_ADDRESS="10.0.2.2.challenger.sslip.io" -PATH=$PATH:$GOPATH/bin ginkgo -v --nodes $GINKGO_NODES --label-filter $LABEL --fail-fast -r ./tests/ +go run github.com/onsi/ginkgo/v2/ginkgo -v --nodes $GINKGO_NODES --label-filter $LABEL --fail-fast -r ./tests/