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

Fixes for BZ#1450307 #4172

Merged
merged 3 commits into from
May 13, 2017
Merged

Fixes for BZ#1450307 #4172

merged 3 commits into from
May 13, 2017

Conversation

ashcrow
Copy link
Member

@ashcrow ashcrow commented May 12, 2017

  • Always set proxy items in /etc/atomic.conf
  • Use /etc/systemd/system/container-engine.service.d for custom file.

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

@ashcrow
Copy link
Member Author

ashcrow commented May 12, 2017

aos-ci-test

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

TIL about 🏄

@ashcrow
Copy link
Member Author

ashcrow commented May 12, 2017

[merge]

@openshift-bot
Copy link

[test]ing while waiting on the merge queue

@openshift-bot
Copy link

Evaluated for openshift ansible test up to a3d7c07

@openshift-bot
Copy link

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

@sdodson
Copy link
Member

sdodson commented May 12, 2017

aos-ci-test

@ashcrow
Copy link
Member Author

ashcrow commented May 12, 2017

flake openshift/origin#13271

@ashcrow
Copy link
Member Author

ashcrow commented May 12, 2017

[merge]

@openshift-bot
Copy link

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

@openshift-bot
Copy link

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

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.6_containerized, aos-ci-jenkins/OS_3.6_containerized_e2e_tests" for a3d7c07 (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 a3d7c07 (logs)

@ashcrow
Copy link
Member Author

ashcrow commented May 12, 2017

Unrelated to my change.

fatal: [10.8.170.43]: FAILED! => {"changed": false, "failed": true, "msg": "OCP rpm version 3.5.5.15 is different from OCP image version 3.5.5.14"}

@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#14129

@openshift-bot
Copy link

Evaluated for openshift ansible merge up to a3d7c07

@openshift-bot
Copy link

openshift-bot commented May 12, 2017

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

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.5_NOT_containerized, aos-ci-jenkins/OS_3.5_NOT_containerized_e2e_tests" for a3d7c07 (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 a3d7c07 (logs)

@openshift-bot
Copy link

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

@openshift-bot
Copy link

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

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

Successfully merging this pull request may close these issues.

4 participants