Skip to content

Commit 6ac352f

Browse files
authoredJul 28, 2022
Bump the github.com/onsi/ginkgo dependency to v2 (#998)
* go.*,vendor: Bump the github.com/onsi/ginkgo dependency to v2 Signed-off-by: timflannagan <[email protected]> * *: Migrate the repository to ginkgo v2 Signed-off-by: timflannagan <[email protected]>
1 parent eb2e639 commit 6ac352f

File tree

237 files changed

+16899
-14238
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+16899
-14238
lines changed
 

‎Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@ clean:
116116

117117
.PHONY: e2e
118118
e2e:
119-
$(GO) run github.com/onsi/ginkgo/ginkgo --v --randomizeAllSpecs --randomizeSuites --race $(if $(TEST),-focus '$(TEST)') $(TAGS) ./test/e2e -- $(if $(SKIPTLS),-skip-tls-verify true) $(if $(USEHTTP),-use-http true)
120-
119+
$(GO) run github.com/onsi/ginkgo/v2/ginkgo --v --randomize-all --progress --trace --randomize-suites --race $(if $(TEST),-focus '$(TEST)') $(TAGS) ./test/e2e -- $(if $(SKIPTLS),-skip-tls-verify true) $(if $(USEHTTP),-use-http true)
121120

122121
.PHONY: release
123122
export OPM_IMAGE_REPO ?= quay.io/operator-framework/opm

‎docs/contributors/e2e_tests.md

+16-16
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ running even after the test suite has completed.
2525
1. Run a specific BDD test using the `TEST` argument to make. Note that this argument uses regular expressions.
2626

2727
```bash
28-
DOCKER_REGISTRY_HOST=localhost:5000 GOENV='GOOS=linux' make build e2e TEST='builds and manipulates bundle and index images' USEHTTP="true" CLUSTER=kind
28+
DOCKER_REGISTRY_HOST=localhost:5000 GOENV='GOOS=linux' make build e2e TEST='builds and manipulates bundle and index images' USEHTTP="true" CLUSTER=kind
2929
```
3030

31-
1. If you want a quick way to ensure that your TEST regex argument will work, you can bypass the
32-
make file and use `-dryRun` with `-focus` and see if the regex would trigger your specific test(s).
31+
1. If you want a quick way to ensure that your TEST regex argument will work, you can bypass the
32+
make file and use `--dry-run` with `--focus` and see if the regex would trigger your specific test(s).
3333

3434
```bash
35-
GOFLAGS="-mod=vendor" go run github.com/onsi/ginkgo/ginkgo --v --randomizeAllSpecs --randomizeSuites --race -dryRun -focus 'builds and manipulates bundle and index images' -tags=json1,kind ./test/e2e
35+
GOFLAGS="-mod=vendor" go run github.com/onsi/ginkgo/v2/ginkgo --v --randomize-all --randomize-suites --race --dry-run --focus 'builds and manipulates bundle and index images' -tags=json1,kind ./test/e2e
3636
```
3737

3838
## Kind with SSL
@@ -55,16 +55,16 @@ make file and use `-dryRun` with `-focus` and see if the regex would trigger you
5555
DOCKER_REGISTRY_HOST=localhost:443 GOENV='GOOS=linux' make build e2e TEST='builds and manipulates bundle and index images' CLUSTER=kind
5656
```
5757

58-
1. If you want a quick way to ensure that your TEST regex argument will work, you can bypass the
59-
make file and use `-dryRun` with `-focus` and see if the regex would trigger your specific test(s).
58+
1. If you want a quick way to ensure that your TEST regex argument will work, you can bypass the
59+
make file and use `--dry-run` with `--focus` and see if the regex would trigger your specific test(s).
6060

6161
```bash
62-
GOFLAGS="-mod=vendor" go run github.com/onsi/ginkgo/ginkgo --v --randomizeAllSpecs --randomizeSuites --race -dryRun -focus 'builds and manipulates bundle and index images' -tags=json1,kind ./test/e2e
62+
GOFLAGS="-mod=vendor" go run github.com/onsi/ginkgo/v2/ginkgo --v --randomize-all --randomize-suites --race --dry-run --focus 'builds and manipulates bundle and index images' -tags=json1,kind ./test/e2e
6363
```
6464

6565
## Minikube (or other type) using kubeconfig without SSL
6666

67-
1. Install `minikube` (see https://minikube.sigs.k8s.io/docs/start/)
67+
1. Install [`minikube`](https://minikube.sigs.k8s.io/docs/start/)
6868

6969
1. Create a minikube cluster
7070

@@ -90,18 +90,18 @@ make file and use `-dryRun` with `-focus` and see if the regex would trigger you
9090
KUBECONFIG="$HOME/.kube/config" DOCKER_REGISTRY_HOST=localhost:5000 make build e2e TEST='builds and manipulates bundle and index images' SKIPTLS="true"
9191
```
9292

93-
1. If you want a quick way to ensure that your TEST regex argument will work, you can bypass the
94-
make file and use `-dryRun` with `-focus` and see if the regex would trigger your specific test(s).
93+
1. If you want a quick way to ensure that your TEST regex argument will work, you can bypass the
94+
make file and use `--dry-run` with `--focus` and see if the regex would trigger your specific test(s).
9595

9696
```bash
97-
GOFLAGS="-mod=vendor" go run github.com/onsi/ginkgo/ginkgo --v --randomizeAllSpecs --randomizeSuites --race -dryRun -focus 'builds and manipulates bundle and index images' -tags=json1 ./test/e2e
97+
GOFLAGS="-mod=vendor" go run github.com/onsi/ginkgo/v2/ginkgo --v --randomize-all --randomize-suites --race --dry-run --focus 'builds and manipulates bundle and index images' -tags=json1 ./test/e2e
9898
```
9999

100100
TIP: use a non-dynamic `kind` server by using `kind get kubeconfig --name "kind" > /tmp/kindconfig` and set `KUBECONFIG="/tmp/kindconfig"`
101101

102102
## Minikube (or other type) using kubeconfig with SSL
103103

104-
1. Install `minikube` (see https://minikube.sigs.k8s.io/docs/start/)
104+
1. Install [`minikube`](https://minikube.sigs.k8s.io/docs/start/)
105105

106106
1. Create a minikube cluster
107107

@@ -127,11 +127,11 @@ TIP: use a non-dynamic `kind` server by using `kind get kubeconfig --name "kind"
127127
KUBECONFIG="$HOME/.kube/config" DOCKER_REGISTRY_HOST=localhost:443 make build e2e TEST='builds and manipulates bundle and index images'
128128
```
129129

130-
1. If you want a quick way to ensure that your TEST regex argument will work, you can bypass the
131-
make file and use `-dryRun` with `-focus` and see if the regex would trigger your specific test(s).
130+
1. If you want a quick way to ensure that your TEST regex argument will work, you can bypass the
131+
make file and use `--dry-run` with `--focus` and see if the regex would trigger your specific test(s).
132132

133133
```bash
134-
GOFLAGS="-mod=vendor" go run github.com/onsi/ginkgo/ginkgo --v --randomizeAllSpecs --randomizeSuites --race -dryRun -focus 'builds and manipulates bundle and index images' -tags=json1 ./test/e2e
134+
GOFLAGS="-mod=vendor" go run github.com/onsi/ginkgo/v2/ginkgo --v --randomize-all --randomize-suites --race --dry-run --focus 'builds and manipulates bundle and index images' -tags=json1 ./test/e2e
135135
```
136136

137137
TIP: use a non-dynamic `kind` server by using `kind get kubeconfig --name "kind" > /tmp/kindconfig` and set `KUBECONFIG="/tmp/kindconfig"`
@@ -140,4 +140,4 @@ TIP: use a non-dynamic `kind` server by using `kind get kubeconfig --name "kind"
140140

141141
Currently the test case `Launch bundle` in test/e2e/bundle_image_test.go assumes that the `opm` executable used in the test is compiled for linux.
142142
If you run this test on a darwin environment, the kube job will not succeed unless you manually cross compile for linux and include
143-
the binary at `bin/opm`.
143+
the binary at `bin/opm`.

0 commit comments

Comments
 (0)
Please sign in to comment.