From 16ba3a4a7e6dc6153a47a299d8644f22fdc04a1b Mon Sep 17 00:00:00 2001 From: Yecheng Fu Date: Mon, 15 Apr 2019 20:36:00 +0800 Subject: [PATCH] - fix e2e workflow in CONTRIBUTING.md - use `[` instead of `[[` to be sh-compatible (SHELL defaults to sh on linux) --- Makefile | 6 +++--- docs/CONTRIBUTING.md | 2 +- tests/manifests/e2e/e2e.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 470dee6994..4f360a190e 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 677c253951..051f5d3f87 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -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: diff --git a/tests/manifests/e2e/e2e.yaml b/tests/manifests/e2e/e2e.yaml index f99a23926f..723e433796 100644 --- a/tests/manifests/e2e/e2e.yaml +++ b/tests/manifests/e2e/e2e.yaml @@ -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