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

Manual cherry pick (#48168 #48277) #48310

Merged
merged 1 commit into from
Jul 20, 2017
Merged

Manual cherry pick (#48168 #48277) #48310

merged 1 commit into from
Jul 20, 2017

Conversation

abgworrall
Copy link
Contributor

Cherry pick of #48168 #48277 on release-1.5.

#48168: Log the OS images used during cluster creation
#48277: Write output into the correct dir

On GCP platforms, e2e testing now logs which OS images the cluster was found to have.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 30, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @abgworrall. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

I understand the commands that are listed here.

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.

@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jun 30, 2017
@abgworrall
Copy link
Contributor Author

The cherry pick is manual, because google_compute.go didn't exist back in 1.5.

@mikedanese
Copy link
Member

/approve

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 30, 2017
@abgworrall
Copy link
Contributor Author

Thanks, Mike ! Can you add an ok-to-test, too ?

@spiffxp
Copy link
Member

spiffxp commented Jun 30, 2017

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 30, 2017
@abgworrall
Copy link
Contributor Author

/retest

@abgworrall
Copy link
Contributor Author

Hi, Mike ! Can you add /lgtm, or should I find someone else to do that ? Or is there some robot magic yet to happen that will apply it :)

@mikedanese
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 5, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abgworrall, mikedanese

Associated issue: 48168

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@mikedanese
Copy link
Member

mikedanese commented Jul 5, 2017 •
edited
Loading

branch owner needs to approve the cherrypick still

@mwielgus mwielgus added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Jul 5, 2017
@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.

@enisoc enisoc added this to the v1.5 milestone Jul 5, 2017
@abgworrall
Copy link
Contributor Author

/test pull-kubernetes-kubemark-e2e-gce

@abgworrall
Copy link
Contributor Author

/test pull-kubernetes-unit

2 similar comments
@abgworrall
Copy link
Contributor Author

/test pull-kubernetes-unit

@abgworrall
Copy link
Contributor Author

/test pull-kubernetes-unit

@abgworrall
Copy link
Contributor Author

/retest

1 similar comment
@abgworrall
Copy link
Contributor Author

/retest

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 11, 2017
@abgworrall
Copy link
Contributor Author

I just rebased the patch, in case that helps with the test flakes

@fejta
Copy link
Contributor

fejta commented Jul 11, 2017

/test pull-kubernetes-e2e-kops-aws

@abgworrall
Copy link
Contributor Author

/retest

@abgworrall abgworrall mentioned this pull request Jul 12, 2017
Closed
@abgworrall
Copy link
Contributor Author

/test pull-kubernetes-e2e-kops-aws

@abgworrall
Copy link
Contributor Author

@fejta , the kops-aws thing is still failing :(

@abgworrall
Copy link
Contributor Author

/test pull-kubernetes-e2e-kops-aws

2 similar comments
@abgworrall
Copy link
Contributor Author

/test pull-kubernetes-e2e-kops-aws

@abgworrall
Copy link
Contributor Author

/test pull-kubernetes-e2e-kops-aws

@abgworrall
Copy link
Contributor Author

/retest

@abgworrall
Copy link
Contributor Author

@mikedanese , the tests were finally fixed ( @saad-ali is my hero :) - can you restore the lgtm that I managed to lose when I rebased ?

@abgworrall
Copy link
Contributor Author

abgworrall commented Jul 17, 2017 •
edited by mikedanese
Loading

/cc @mwielgus

Hi Marcin ! When you get back, can you give this backport your blessing ? Hopefully while the tests are still passing ;)

@k8s-ci-robot k8s-ci-robot requested a review from mwielgus July 17, 2017 19:56
@mikedanese mikedanese added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 18, 2017
@abgworrall
Copy link
Contributor Author

/test pull-kubernetes-e2e-gce-etcd3

@fejta
Copy link
Contributor

fejta commented Jul 18, 2017

/retest

@abgworrall
Copy link
Contributor Author

/test pull-kubernetes-e2e-gce-etcd3

@abgworrall
Copy link
Contributor Author

/retest

@abgworrall
Copy link
Contributor Author

/test pull-kubernetes-e2e-gce-etcd3

@abgworrall
Copy link
Contributor Author

Hey @mikedanese , can you merge this ? Or does that need @mwielgus ? (I'm not sure of the process, and it seems that this patch is mergeable, after three weeks !)

@abgworrall
Copy link
Contributor Author

/test pull-kubernetes-e2e-gce-etcd3

I think the 'test' command needs a 'number of attempts' argument :/

@abgworrall
Copy link
Contributor Author

/test pull-kubernetes-e2e-gce-etcd3

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 7bfc157 into kubernetes:release-1.5 Jul 20, 2017
@abgworrall abgworrall deleted the log-os-images-1-5 branch July 20, 2017 00:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mwielgus mwielgus Awaiting requested review from mwielgus

Assignees

@mikedanese mikedanese

@enisoc enisoc

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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 Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.5
Development

Successfully merging this pull request may close these issues.
9 participants
@abgworrall @k8s-ci-robot @mikedanese @spiffxp @k8s-github-robot @k8s-cherrypick-bot @fejta @enisoc @mwielgus