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.

Sign up for GitHub

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

Jump to bottom

Automated cherry pick of #39342 #39074 #38196 #39765

Merged
merged 4 commits into from
Jan 12, 2017
Merged

Automated cherry pick of #39342 #39074 #38196 #39765

merged 4 commits into from
Jan 12, 2017

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Jan 11, 2017 •
edited
Loading

Cherry pick of #39342 #39074 #38196 on release-1.3.

#39342: Update boilerplate.py to support 2017
#39074: Support set user with --ssh-user flag when running remote
#38196: fix mesos unit tests

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 11, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@ixdy
Copy link
Member Author

ixdy commented Jan 11, 2017

Semi-automated; I ran hack/update-all.sh -v on the branch, rather than using the cherry-picked commit from master.

I think this fixes both the verification checks and node e2e tests on this branch. FYI @Random-Liu @krzyzacy

@krzyzacy
Copy link
Member

There's no running 1.3-node test, but this won't hurt.

@fabioy fabioy added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate labels Jan 11, 2017
@ixdy
Copy link
Member Author

ixdy commented Jan 11, 2017

@krzyzacy we're still running node e2e tests for PRs. #39707 failed because of it.

@fabioy
Copy link
Contributor

fabioy commented Jan 11, 2017

Eek, must we pick up all the copyright year changes as well?

@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@k8s-github-robot k8s-github-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. release-note-label-needed labels Jan 11, 2017
@krzyzacy
Copy link
Member

@ixdy ah... forgot about that part :-p

@ixdy
Copy link
Member Author

ixdy commented Jan 11, 2017

@fabioy yep, because dumb. #39342 (comment) (and see where it recently failed on 1.3 here: https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/pr-logs/pull/39707/pull-kubernetes-verify/12024/)

@ixdy ixdy added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Jan 11, 2017
@k8s-ci-robot
Copy link
Contributor

Jenkins unit/integration failed for commit e731552. Full PR test history.

The magic incantation to run this job again is @k8s-bot unit test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@ixdy
Copy link
Member Author

ixdy commented Jan 11, 2017

oh, we need #38196 for the mesos unit test. I will add it...

@ixdy ixdy changed the title Automated cherry pick of #39342 #39074 Automated cherry pick of #39342 #39074 #38196 Jan 11, 2017
@fabioy fabioy added this to the v1.3 milestone Jan 12, 2017
@ixdy
Copy link
Member Author

ixdy commented Jan 12, 2017

yay, all build pass. can I get an LG?

@ixdy ixdy mentioned this pull request Jan 12, 2017
Merged
@fabioy fabioy added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 12, 2017
@fabioy fabioy merged commit 6998c71 into kubernetes:release-1.3 Jan 12, 2017
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.3" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@ixdy ixdy deleted the automated-cherry-pick-of-#39342-#39074-upstream-release-1.3 branch May 15, 2018 23:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@fabioy fabioy

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
v1.3
Development

Successfully merging this pull request may close these issues.
9 participants
@ixdy @k8s-reviewable @krzyzacy @fabioy @k8s-cherrypick-bot @k8s-ci-robot @k8s-github-robot @Random-Liu @deads2k