Skip to content
This repository was archived by the owner on Feb 5, 2020. It is now read-only.

Conversation

@squat
Copy link
Contributor

@squat squat commented Oct 20, 2017

This change ensures that a Container Linux version will be reported even
if update-engine has not finished running and creating an
`aleph-version' file. If this is the case, we will simple read the
version from the canonical location, /usr/share/coreos/release.

cc @cpanato @enxebre

@squat
Copy link
Contributor Author

squat commented Oct 20, 2017

ok to test

mxinden
mxinden previously approved these changes Oct 20, 2017
cpanato
cpanato previously approved these changes Oct 20, 2017
@enxebre
Copy link
Contributor

enxebre commented Oct 20, 2017

👍

@squat
Copy link
Contributor Author

squat commented Oct 20, 2017

between this run and the last, all of the smoke tests have successfully completed.

@squat squat dismissed stale reviews from cpanato and mxinden via d63535f October 20, 2017 13:31
@squat squat force-pushed the refactor_cl_version branch from 4b9a855 to d63535f Compare October 20, 2017 13:31
@squat
Copy link
Contributor Author

squat commented Oct 20, 2017

@cpanato PTAL once more, I removed an extra space between the done and the ;. It doesn't affect code execution but does affect my OCD

This change ensures that a Container Linux version will be reported even
if update-engine has not finished running and creating an
`aleph-version' file. If this is the case, we will simple read the
version from the canonical location, /usr/share/coreos/release.
@enxebre
Copy link
Contributor

enxebre commented Oct 20, 2017

Just run the tests from this branch #2178 and the changes in this PR on GCP and all green

@squat squat merged commit 1f231a8 into coreos:master Oct 20, 2017
@squat squat deleted the refactor_cl_version branch October 20, 2017 14:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants