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

Backport logs with attach #12648

Merged
merged 2 commits into from
Jan 25, 2017

Conversation

ncdc
Copy link
Contributor

@ncdc ncdc commented Jan 24, 2017

Andy Goldstein added 2 commits January 24, 2017 10:57
This is docker/docker PR 26718 because docker has reintegrated
engine-api into the primary docker repo.
@ncdc
Copy link
Contributor Author

ncdc commented Jan 24, 2017

I haven't touched any tests yet. Let me know what needs changing since things have evolved since I was last in there.

@smarterclayton
Copy link
Contributor

[test]

@smarterclayton
Copy link
Contributor

I believe @soltysh added set +e around the failing tests

@smarterclayton
Copy link
Contributor

in test/end-to-end/core.sh

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to a93931b

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/13248/) (Base Commit: c5868ac)

@smarterclayton
Copy link
Contributor

I think just revert 5696d6d

@soltysh
Copy link
Contributor

soltysh commented Jan 25, 2017

If the problem persists, and from what I've seen it's still there I'll look into that bug more. Otherwise this LGTM, except for that change Clayton asked for.

@ncdc
Copy link
Contributor Author

ncdc commented Jan 25, 2017

Talked to @soltysh on irc. We're going to merge this as-is, but keep the changes to the tests that allow the in-cluster configuration tests to fail without erroring. We'll let jenkins run tests for a few days and then check to see if this PR has resolved the issue or if it's still happening.

@ncdc
Copy link
Contributor Author

ncdc commented Jan 25, 2017

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to a93931b

@openshift-bot
Copy link
Contributor

openshift-bot commented Jan 25, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/13302/) (Base Commit: f762dc6) (Image: devenv-rhel7_5776)

@openshift-bot openshift-bot merged commit 7b6ccb0 into openshift:master Jan 25, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants