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

Remove userland-proxy-path from daemon.json #4174

Merged
merged 1 commit into from
May 13, 2017
Merged

Remove userland-proxy-path from daemon.json #4174

merged 1 commit into from
May 13, 2017

Conversation

ashcrow
Copy link
Member

@ashcrow ashcrow commented May 12, 2017 •
edited
Loading

This flag is currently being set within the system container via the init.sh

https://bugzilla.redhat.com/show_bug.cgi?id=1448384

@ashcrow
Remove userland-proxy-path from daemon.json
6bc3ccc 
This flag is currently being set within the system container via
the init.sh
@ashcrow ashcrow requested a review from abutcher May 12, 2017 16:29
@ashcrow
Copy link
Member Author

ashcrow commented May 12, 2017

aos-ci-test

abutcher
abutcher approved these changes May 12, 2017
View reviewed changes
Copy link
Member

@abutcher abutcher left a comment

Choose a reason for hiding this comment

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

LGTM 💥

@ashcrow
Copy link
Member Author

ashcrow commented May 12, 2017

aos-ci-test

@ashcrow
Copy link
Member Author

ashcrow commented May 12, 2017

[merge]

@openshift-bot
Copy link

Evaluated for openshift ansible merge up to 6bc3ccc

@openshift-bot
Copy link

[test]ing while waiting on the merge queue

@openshift-bot
Copy link

Evaluated for openshift ansible test up to 6bc3ccc

@openshift-bot
Copy link

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_openshift_ansible/118/) (Base Commit: d1d60e2)

@ashcrow
Copy link
Member Author

ashcrow commented May 12, 2017

😕

Ginkgo ran 1 suite in 15m30.950535793s
Test Suite Passed
[INFO] Dumping container logs to [...]
[INFO] Exiting
[ERROR] PID 28914: test/extended/conformance.sh:51: `[[ -n "${LOG_DIR:-}" && -d "${LOG_DIR-}" ]]` exited with status 1.
[INFO] 		Stack Trace: 
[INFO] 		  1: test/extended/conformance.sh:51: `[[ -n "${LOG_DIR:-}" && -d "${LOG_DIR-}" ]]`
[INFO]   Exiting with code 1.
make: *** [test-extended] Error 1

@ashcrow
Copy link
Member Author

ashcrow commented May 12, 2017

aos-ci-test

@ashcrow
Copy link
Member Author

ashcrow commented May 12, 2017

[merge]

@ashcrow
Copy link
Member Author

ashcrow commented May 12, 2017

/cc @sdodson: Failures are unrelated.

@sdodson
Copy link
Member

sdodson commented May 12, 2017

flake on openshift/origin#12072

@openshift-bot
Copy link

error: aos-ci-jenkins/OS_3.5_containerized for 6bc3ccc (logs)

@openshift-bot
Copy link

error: aos-ci-jenkins/OS_3.5_NOT_containerized for 6bc3ccc (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.6_NOT_containerized, aos-ci-jenkins/OS_3.6_NOT_containerized_e2e_tests" for 6bc3ccc (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.6_containerized, aos-ci-jenkins/OS_3.6_containerized_e2e_tests" for 6bc3ccc (logs)

@sdodson
Copy link
Member

sdodson commented May 12, 2017

aos-ci-test

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.5_NOT_containerized, aos-ci-jenkins/OS_3.5_NOT_containerized_e2e_tests" for 6bc3ccc (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.6_NOT_containerized, aos-ci-jenkins/OS_3.6_NOT_containerized_e2e_tests" for 6bc3ccc (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.6_containerized, aos-ci-jenkins/OS_3.6_containerized_e2e_tests" for 6bc3ccc (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.5_containerized, aos-ci-jenkins/OS_3.5_containerized_e2e_tests" for 6bc3ccc (logs)

@openshift-bot
Copy link

openshift-bot commented May 13, 2017 •
edited
Loading

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_openshift_ansible/375/) (Base Commit: d2a435c)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.5_NOT_containerized, aos-ci-jenkins/OS_3.5_NOT_containerized_e2e_tests" for 6bc3ccc (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.6_NOT_containerized, aos-ci-jenkins/OS_3.6_NOT_containerized_e2e_tests" for 6bc3ccc (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.5_containerized, aos-ci-jenkins/OS_3.5_containerized_e2e_tests" for 6bc3ccc (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.6_containerized, aos-ci-jenkins/OS_3.6_containerized_e2e_tests" for 6bc3ccc (logs)

@openshift-bot openshift-bot merged commit 7eae685 into openshift:master May 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abutcher abutcher abutcher approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ashcrow @openshift-bot @sdodson @abutcher