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

Remove Docker 1.10 requirement temporarily. #2021

Merged
merged 2 commits into from
Jun 13, 2016

Conversation

dgoodwin
Copy link
Contributor

Docker 1.10 is not widely available in RHEL / CentOS yet, lets remove
the restriction for users of master / origin. We can revert as soon as
it's available publicly.

@sdodson @brenton @detiber @abutcher what do you guys think? This reverts part of the Docker 1.10 stuff and would allow master users to still install and upgrade while we wait for 1.10. We can revert as soon as it's available.

This is actually pretty close to what @sdodson suggested:

  • just require docker to be installed in the docker role
  • 3.2 upgrade will always upgrade docker to newest available if we're below 1.9.
  • docker 1.10 upgrade playbook is still there for anyone who wants it

No real version checking left. Thoughts?

(NOTE: testing still underway)

dgoodwin and others added 2 commits June 10, 2016 15:47
Docker 1.10 is not widely available in RHEL / CentOS yet, lets remove
the restriction for users of master / origin. We can revert as soon as
it's available publically.
@sdodson
Copy link
Member

sdodson commented Jun 10, 2016

+1 from me, even if it's only temporary so we can get tests passing again

@sdodson
Copy link
Member

sdodson commented Jun 10, 2016

aos-ci-test-extended

@openshift-bot
Copy link

666657a - State: success - Test Context: aos-ci-jenkins/OS_unit_tests - Test Description: all unit tests passed - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-pre-test-12/666657a4969851a0e08357334ffe60a156024980.txt

@openshift-bot
Copy link

666657a - State: success - Test Context: aos-ci-jenkins/OS_3.1_NOT_containerized - Test Description: openshift-ansible install passed - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-run-openshift-ansible-29/666657a4969851a0e08357334ffe60a156024980.txt

@openshift-bot
Copy link

666657a - State: error - Test Context: aos-ci-jenkins/OS_3.1_containerized - Test Description: openshift-ansible install failed - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-run-openshift-ansible-30/666657a4969851a0e08357334ffe60a156024980.txt

@openshift-bot
Copy link

666657a - State: success - Test Context: aos-ci-jenkins/OS_3.1_NOT_containerized_e2e_tests - Test Description: all e2e tests passed - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-run-e2e-tests-12/666657a4969851a0e08357334ffe60a156024980.txt

@openshift-bot
Copy link

666657a - State: success - Test Context: aos-ci-jenkins/OS_3.1_NOT_containerized_upgrade - Test Description: upgrade passed - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-upgrade-1/666657a4969851a0e08357334ffe60a156024980.txt

@sdodson
Copy link
Member

sdodson commented Jun 13, 2016

aos-ci-test-extended

@detiber
Copy link
Contributor

detiber commented Jun 13, 2016

I think I'd like to see the ability to install a specific version (only handling the upgrade case, fail if downgrade required) and just not enforce a minimum version.

It'd be nice if we could give the users a warning about potential issues, but we don't have a way to bubble that up yet. There is a facility for returning warnings from an Ansible module, but that would get list in the noise.

We could potentially have a validation playbook that runs and gives useful output...

@openshift-bot
Copy link

666657a - State: success - Test Context: aos-ci-jenkins/OS_unit_tests - Test Description: all unit tests passed - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible/jenkins-openshift-ansible-pre-test-13/666657a4969851a0e08357334ffe60a156024980.txt

@sdodson sdodson merged commit fcb22cd into openshift:master Jun 13, 2016
@sdodson
Copy link
Member

sdodson commented Jun 13, 2016

Merged as is, the failed tests aren't related to this change. We'll follow up to add the ability to specify desired docker version.

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