Skip to content

Commit 7db0b18

Browse files
committed
Makefile: switch test/e2e/* to test-e2e-*
1 parent a4d2d76 commit 7db0b18

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
- if: tag IS present OR branch != master
110110
<<: *test
111111
name: Go on Kubernetes
112-
script: make test/e2e/go
112+
script: make test-e2e-go
113113

114114
# Build and test ansible and test ansible using molecule in non-master PRs
115115
- if: tag IS present OR branch != master
@@ -119,14 +119,14 @@ jobs:
119119
- pip3 install --upgrade setuptools pip
120120
- pip install --user ansible
121121
script:
122-
- make test/e2e/ansible
123-
- make test/e2e/ansible-molecule
122+
- make test-e2e-ansible
123+
- make test-e2e-ansible-molecule
124124

125125
# Build and test helm in non-master PRs
126126
- if: tag IS present OR branch != master
127127
<<: *test
128128
name: Helm on Kubernetes
129-
script: make test/e2e/helm
129+
script: make test-e2e-helm
130130

131131
# Test subcommands in non-master PRs
132132
- if: tag IS present OR branch != master
@@ -144,7 +144,7 @@ jobs:
144144
- if: tag IS NOT present AND branch = master
145145
<<: *test
146146
name: Ansible Molecule on Kubernetes
147-
script: make test/e2e/ansible-molecule
147+
script: make test-e2e-ansible-molecule
148148

149149
# Run the unit, sanity, and markdown tests
150150
- stage: test

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ test-unit: ## Run the unit tests
122122
# CI tests.
123123
.PHONY: test-ci
124124

125-
test-ci: test-markdown test-sanity test-unit install test-subcommand test/e2e ## Run the CI test suite
125+
test-ci: test-markdown test-sanity test-unit install test-subcommand test-e2e ## Run the CI test suite
126126

127127
# Subcommand tests.
128128
.PHONY: test-subcommand test-subcommand-local test-subcommand-scorecard test-subcommand-olm-install
@@ -139,20 +139,20 @@ test-subcommand-olm-install:
139139
./hack/tests/subcommand-olm-install.sh
140140

141141
# E2E tests.
142-
.PHONY: test/e2e test/e2e/go test/e2e/ansible test/e2e/ansible-molecule test/e2e/helm
142+
.PHONY: test-e2e test-e2e-go test-e2e-ansible test-e2e-ansible-molecule test-e2e-helm
143143

144-
test/e2e: test/e2e/go test/e2e/ansible test/e2e/ansible-molecule test/e2e/helm ## Run the e2e tests
144+
test-e2e: test-e2e-go test-e2e-ansible test-e2e-ansible-molecule test-e2e-helm ## Run the e2e tests
145145

146-
test/e2e/go:
146+
test-e2e-go:
147147
./hack/tests/e2e-go.sh $(ARGS)
148148

149-
test/e2e/ansible: image/build/ansible
149+
test-e2e-ansible: image/build/ansible
150150
./hack/tests/e2e-ansible.sh
151151

152-
test/e2e/ansible-molecule: image/build/ansible
152+
test-e2e-ansible-molecule: image/build/ansible
153153
./hack/tests/e2e-ansible-molecule.sh
154154

155-
test/e2e/helm: image/build/helm
155+
test-e2e-helm: image/build/helm
156156
./hack/tests/e2e-helm.sh
157157

158158
# Image scaffold/build/push.

ci/prow.Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ export GOPROXY ?= https://proxy.golang.org/
77
build:
88
$(MAKE) -f Makefile build/operator-sdk
99

10-
test/e2e/go:
10+
test-e2e-go:
1111
./ci/tests/e2e-go.sh $(ARGS)
1212

13-
test/e2e/ansible:
13+
test-e2e-ansible:
1414
./ci/tests/e2e-ansible.sh
1515

16-
test/e2e/helm:
16+
test-e2e-helm:
1717
./ci/tests/e2e-helm.sh
1818

1919
test-subcommand:

doc/dev/testing/running-the-tests.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ All the tests are run through the [`Makefile`][makefile]. This is a brief descri
5858
- `test-sanity` - Runs sanity checks.
5959
- `test-unit` - Runs unit tests.
6060
- `test-subcommand` - Runs subcommand tests.
61-
- `test/e2e` - Runs all E2E tests (`test/e2e/go`, `test/e2e/ansible`, `test/e2e/ansible-molecule`, and `e2e/helm`).
62-
- `test/e2e/go` - Runs the go E2E test.
63-
- `test/e2e/ansible` - Runs the ansible E2E test.
64-
- `test/e2e/ansible-molecule` - Runs the ansible molecule E2E test.
65-
- `test/e2e/helm` - Runs the helm E2E test.
61+
- `test-e2e` - Runs all E2E tests (`test-e2e-go`, `test-e2e-ansible`, `test-e2e-ansible-molecule`, and `test-e2e-helm`).
62+
- `test-e2e-go` - Runs the go E2E test.
63+
- `test-e2e-ansible` - Runs the ansible E2E test.
64+
- `test-e2e-ansible-molecule` - Runs the ansible molecule E2E test.
65+
- `test-e2e-helm` - Runs the helm E2E test.
6666
- `test-markdown` - Runs the markdown checks
6767

6868
For more info on what these tests actually do, please see the [Travis Build][travis] doc.
@@ -72,14 +72,14 @@ and the operator images will be built and stored in you local docker registry.
7272

7373
### Go E2E test flags
7474

75-
The `make test/e2e/go` command accepts an `ARGS` variable containing flags that will be passed to `go test`:
75+
The `make test-e2e-go` command accepts an `ARGS` variable containing flags that will be passed to `go test`:
7676

7777
- `-image-name` string - Sets the operator test image tag to be built and used in testing. Defaults to "quay.io/example/memcached-operator:v0.0.1"
7878
- `-local-repo` string - Sets the path to the local SDK repo being tested. Defaults to the path of the SDK repo containing e2e tests. This is useful for testing customized e2e code.
7979

8080
An example of using `ARGS` is in the note below.
8181

82-
**NOTE**: Some of these tests, specifically the ansible (`test/e2e/ansible`), helm (`test/e2e/helm`), and Go (`test/e2e/go`) tests,
82+
**NOTE**: Some of these tests, specifically the ansible (`test-e2e-ansible`), helm (`test-e2e-helm`), and Go (`test-e2e-go`) tests,
8383
only work when the cluster shares the local docker registry, as is the case with `oc cluster up` and `minikube` after running `eval $(minikube docker-env)`.
8484

8585
```sh

doc/dev/testing/travis-build.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ The Go, Ansible, and Helm tests then differ in what tests they run.
7575

7676
### Ansible tests
7777

78-
1. Run [ansible molecule tests][ansible-molecule]. (`make test/e2e/ansible-molecule)
78+
1. Run [ansible molecule tests][ansible-molecule]. (`make test-e2e-ansible-molecule)
7979
1. Create and configure a new ansible type memcached-operator.
8080
2. Create cluster resources.
8181
3. Run `operator-sdk test local` to run ansible molecule tests

0 commit comments

Comments
 (0)