Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update e2e workflow in CONTRIBUTING.md #392

Merged
merged 1 commit into from
Apr 16, 2019
Merged

Conversation

cofyc
Copy link
Contributor

@cofyc cofyc commented Apr 15, 2019

  • use [ instead of [[ to be sh-compatible (more portable)
  • fix e2e workflow in CONTRIBUTING.md

make e2e-docker builds e2e image from tests/images/e2e instead of images/tidb-operator-e2e, we should use new e2e yaml file tests/manifests/e2e/e2e.yaml.

xref: #346

@CLAassistant
Copy link

CLAassistant commented Apr 15, 2019

CLA assistant check
All committers have signed the CLA.

@cofyc cofyc requested review from xiaojingchen and weekface April 15, 2019 12:51
@@ -27,7 +27,7 @@ spec:
serviceAccount: tidb-operator-e2e
containers:
- name: tidb-operator-e2e
image: ""
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xiaojingchen
Not sure why it is empty in your #346 PR, can we give it a default value, then it can be applied by kubectl?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this's ok. in fact the image will be replaced when e2e ci running.

weekface
weekface previously approved these changes Apr 15, 2019
Copy link
Contributor

@weekface weekface left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@cofyc
Copy link
Contributor Author

cofyc commented Apr 16, 2019

/run-e2e-tests

- use `[` instead of `[[` to be sh-compatible (SHELL defaults to sh on
linux)
@weekface
Copy link
Contributor

CI failed, because these is a gofmt issue caused by pr #386, you can fix it in this pr or just ignore it.

@cofyc
Copy link
Contributor Author

cofyc commented Apr 16, 2019

It has been fixed here, so I rebased on master and try again.

[[ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@onlymellb PTAL

@xiaojingchen xiaojingchen merged commit 052b087 into pingcap:master Apr 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants