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

Update glide #19145

Merged
merged 2 commits into from Mar 30, 2018
Merged

Update glide #19145

merged 2 commits into from Mar 30, 2018

Conversation

liggitt
Copy link
Contributor

@liggitt liggitt commented Mar 29, 2018 •
edited

gets master back in sync with the expected carries for opencontainers/runc in preparation for the 1.10 rebase

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 29, 2018
liggitt
liggitt commented Mar 29, 2018
View reviewed changes
vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_systemd.go
@@ -296,17 +295,10 @@ func (m *Manager) Apply(pid int) error {
}
}

statusChan := make(chan string)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@sjenning can you verify this is the end result we want? (this matches the release-3.9 branch... some of the reverts that made it in there didn't make it into master)

Copy link
Contributor

Choose a reason for hiding this comment

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

yes, this looks correct in that it is the net effect of the patch, then the revert.

@liggitt
Copy link
Contributor Author

liggitt commented Mar 29, 2018

/retest

@liggitt
Copy link
Contributor Author

liggitt commented Mar 29, 2018 •
edited

extended build failure looks like a pre-existing failure:

[Feature:Builds][pruning] prune builds based on settings in the buildconfig successful, failed, canceled, and errored builds should be pruned based on settings in the build config

Also seen in:

@liggitt
Copy link
Contributor Author

liggitt commented Mar 29, 2018

/test extended_builds

@liggitt
Copy link
Contributor Author

liggitt commented Mar 29, 2018

imagebuilder changes verified by @smarterclayton
s2i json changes verified by @bparees
runc changes verified by @sjenning

@liggitt
Copy link
Contributor Author

liggitt commented Mar 29, 2018

/test gcp

@liggitt liggitt mentioned this pull request Mar 29, 2018
Closed
@liggitt
Copy link
Contributor Author

liggitt commented Mar 30, 2018

single pre-existing failure (#17805) in https://openshift-gce-devel.appspot.com/build/origin-ci-test/pr-logs/pull/19145/test_pull_request_origin_extended_conformance_gce/18318/

@liggitt liggitt merged commit 3675173 into openshift:master Mar 30, 2018
@openshift-ci-robot
Copy link

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

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_builds a679b9d link /test extended_builds
ci/openshift-jenkins/extended_image_ecosystem a679b9d link /test extended_image_ecosystem
ci/openshift-jenkins/gcp a679b9d link /test gcp

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 deleted the glide-3.10-updates branch March 31, 2018 02:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sjenning sjenning sjenning left review comments

@deads2k deads2k Awaiting requested review from deads2k

@soltysh soltysh Awaiting requested review from soltysh

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@liggitt @openshift-ci-robot @sjenning