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

1.8.5 rebase #17849

Merged
merged 5 commits into from
Jan 10, 2018
Merged

1.8.5 rebase #17849

merged 5 commits into from
Jan 10, 2018

Conversation

liggitt
Copy link
Contributor

@liggitt liggitt commented Dec 18, 2017 •
edited
Loading

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 18, 2017
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Dec 18, 2017
@openshift-merge-robot openshift-merge-robot added needs-api-review vendor-update Touching vendor dir or related files labels Dec 18, 2017
@liggitt liggitt mentioned this pull request Dec 18, 2017
Closed
@liggitt liggitt changed the base branch from master to release-3.8 December 18, 2017 03:36
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 18, 2017
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 18, 2017
@liggitt
Copy link
Contributor Author

liggitt commented Dec 18, 2017

/test extended_clusterup
/test extended_image_registry
/test extended_builds

@liggitt
Copy link
Contributor Author

liggitt commented Dec 18, 2017

/retest

@liggitt liggitt changed the title 1.8.5 rebase WIP - 1.8.5 rebase Dec 18, 2017
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 18, 2017
@mfojtik
Copy link
Contributor

mfojtik commented Dec 18, 2017 •
edited
Loading

@liggitt need to add list and watch (metav1.Verbs{"delete", "list", "watch"})

@liggitt
Copy link
Contributor Author

liggitt commented Dec 18, 2017 •
edited
Loading

@liggitt need to add list and watch (metav1.Verbs{"delete", "list", "watch"})

yup, repicked in openshift/kubernetes and updated here. also regenerated swagger docs here. not sure what's up with the router tests... might be issues with switching CI to go1.9?

@deads2k
Copy link
Contributor

deads2k commented Dec 21, 2017

Because the forks have no utility beyond dependency calculation and are massively painful to maintain. We don't actually use them in vendoring in origin and we don't intend for people to vendor them independently apart from origin.

That's not entirely true. image-registry and oc have to vendor them in. When we started, there were a couple other who were trying to vendor openshift/origin too.

@deads2k deads2k mentioned this pull request Dec 21, 2017
Merged
@liggitt liggitt changed the title WIP - 1.8.5 rebase 1.8.5 rebase Jan 8, 2018
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 8, 2018
@liggitt
Copy link
Contributor Author

liggitt commented Jan 8, 2018

this is ready

@liggitt
Copy link
Contributor Author

liggitt commented Jan 9, 2018

/retest

1 similar comment
@liggitt
Copy link
Contributor Author

liggitt commented Jan 9, 2018

/retest

@liggitt
Copy link
Contributor Author

liggitt commented Jan 9, 2018 •
edited
Loading

extended build failures are inconsistent:

@liggitt
Copy link
Contributor Author

liggitt commented Jan 9, 2018

/retest

@deads2k
Copy link
Contributor

deads2k commented Jan 9, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 9, 2018
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@deads2k
Copy link
Contributor

deads2k commented Jan 10, 2018

/retest

If nothing new merges into https://github.com/openshift/origin/commits/release-3.8, I'll green button on green tests.

@liggitt
Copy link
Contributor Author

liggitt commented Jan 10, 2018

extended build flake, green otherwise

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, liggitt

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

@liggitt
Copy link
Contributor Author

liggitt commented Jan 10, 2018

resynced openshift/kubernetes from release-3.8, rebased (two UPSTREAM commits came in)

@openshift-merge-robot
Copy link
Contributor

/lgtm cancel //PR changed after LGTM, removing LGTM. @deads2k @liggitt @mfojtik @smarterclayton

@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Jan 10, 2018
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 10, 2018 •
edited
Loading

@liggitt: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_builds 58dd94e link /test extended_builds
ci/openshift-jenkins/extended_image_ecosystem 58dd94e link /test extended_image_ecosystem

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open 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.

@liggitt liggitt mentioned this pull request Jan 10, 2018
Closed
@jupierce jupierce self-assigned this Jan 10, 2018
@deads2k
Copy link
Contributor

deads2k commented Jan 10, 2018

Green as it will get. Merging.

@deads2k deads2k merged commit 8b7ccd3 into openshift:release-3.8 Jan 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mfojtik mfojtik mfojtik left review comments

@deads2k deads2k deads2k left review comments

Assignees

@mfojtik mfojtik

@smarterclayton smarterclayton

@deads2k deads2k

@jupierce jupierce

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. needs-api-review size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. vendor-update Touching vendor dir or related files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@liggitt @deads2k @mfojtik @openshift-bot @openshift-ci-robot @openshift-merge-robot @smarterclayton @jupierce