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

Automated cherry pick of #8427 to release 3.1 branch #8806

Conversation

jpbetz
Copy link
Contributor

@jpbetz jpbetz commented Nov 1, 2017

Fixes: #8411

This is pending #8805, which requires approval before we merge any cherrypicks targeting the 3.1 branch. Submitting it now for testing.

@jpbetz
Copy link
Contributor Author

jpbetz commented Nov 1, 2017

cc @liggitt @timothysc

@xiang90
Copy link
Contributor

xiang90 commented Nov 1, 2017

@jpbetz seems like ci does not like 3.1 release.

@gyuho
Copy link
Contributor

gyuho commented Nov 2, 2017

Yeah, Semaphore doesn't support per-branch commands.

We might need manually build release-3.1 test image and add .semaphore.sh to release-3.1 branch. I have scripts to do that here #8764. I can add those images and scripts to release-3.1 branch tomorrow.

@gyuho
Copy link
Contributor

gyuho commented Nov 2, 2017

Actually, if we are going to use Go 1.8.5 for release-3.1, we already have image.
So just need to add https://github.com/coreos/etcd/blob/release-3.2/.semaphore.sh to release-3.1.

/cc @xiang90

@jpbetz
Copy link
Contributor Author

jpbetz commented Nov 2, 2017

Fixing with #8807. After that is merged I'll rebase this.

@jpbetz jpbetz force-pushed the automated-cherry-pick-of-#8427-origin-release-3.1-1509570173 branch from 6bacf5b to e83f50e Compare November 3, 2017 00:15
@xiang90
Copy link
Contributor

xiang90 commented Nov 9, 2017

this is ready to merge? /cc @jpbetz

@jpbetz
Copy link
Contributor Author

jpbetz commented Nov 10, 2017

@xiang90, yes, this is now ready.

@xiang90 xiang90 merged commit 3ab9894 into etcd-io:release-3.1 Nov 10, 2017
@xiang90
Copy link
Contributor

xiang90 commented Nov 10, 2017

@jpbetz oops... The commit message actually does match our format. No idea why CI does not catch it.

/cc @gyuho

@gyuho
Copy link
Contributor

gyuho commented Nov 10, 2017

It does? Did you mean PR title?

Also 3.1 does check commit title https://github.com/coreos/etcd/blob/release-3.1/test#L202.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants