Skip to content

Commit

Permalink
- fix e2e workflow in CONTRIBUTING.md (#392)
Browse files Browse the repository at this point in the history
- use `[` instead of `[[` to be sh-compatible (SHELL defaults to sh on
linux)
  • Loading branch information
cofyc authored and xiaojingchen committed Apr 16, 2019
1 parent b04d0d2 commit 052b087
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ e2e-docker-push: e2e-docker
docker push "${DOCKER_REGISTRY}/pingcap/tidb-operator-e2e:latest"

e2e-docker: e2e-build
[[ -d tests/images/e2e/tidb-operator ]] && rm -r tests/images/e2e/tidb-operator || true
[[ -d tests/images/e2e/tidb-cluster ]] && rm -r tests/images/e2e/tidb-cluster || true
[[ -d tests/images/e2e/tidb-backup ]] && rm -r tests/images/e2e/tidb-backup || true
[ -d tests/images/e2e/tidb-operator ] && rm -r tests/images/e2e/tidb-operator || true
[ -d tests/images/e2e/tidb-cluster ] && rm -r tests/images/e2e/tidb-cluster || true
[ -d tests/images/e2e/tidb-backup ] && rm -r tests/images/e2e/tidb-backup || true
cp -r charts/tidb-operator tests/images/e2e
cp -r charts/tidb-cluster tests/images/e2e
cp -r charts/tidb-backup tests/images/e2e
Expand Down
2 changes: 1 addition & 1 deletion docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ $ make e2e-docker-push
After Docker images are pushed to the DinD Docker registry, run e2e tests:

```sh
$ kubectl apply -f manifests/tidb-operator-e2e.yaml
$ kubectl apply -f tests/manifests/e2e/e2e.yaml
```

You can get the e2e test report from the log of testing pod:
Expand Down
2 changes: 1 addition & 1 deletion tests/manifests/e2e/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
serviceAccount: tidb-operator-e2e
containers:
- name: tidb-operator-e2e
image: ""
image: 127.0.0.1:5000/pingcap/tidb-operator-e2e:latest
imagePullPolicy: Always
command:
- /usr/local/bin/e2e
Expand Down

0 comments on commit 052b087

Please sign in to comment.