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

cmd-build: Rename OSTree commit object #517

Merged
merged 1 commit into from
May 16, 2019

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented May 8, 2019

Rename the OSTree commit object to ostree-commit-object to be more
explicit. I'd like the term "OSTree commit" to refer to the whole tree.

Split out of #515.

Rename the OSTree commit object to `ostree-commit-object` to be more
explicit. I'd like the term "OSTree commit" to refer to the whole tree.
@@ -22,5 +22,5 @@ r.open(None)

[_, rev] = r.resolve_rev(args.rev, True)
[_, commit, _] = r.load_commit(rev)
with open(args.builddir + '/ostree-commit', 'wb') as f:
with open(args.builddir + '/ostree-commit-object', 'wb') as f:
Copy link
Member

Choose a reason for hiding this comment

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

Will backcompat be a problem if we wholly rename it? Or is the idea to change the usage of the commit object entirely in #515?

Copy link
Member Author

Choose a reason for hiding this comment

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

Ahh OK, so this is not used elsewhere in cosa, but is used internally in the RHCOS pipeline to prepare for the next build. So yes, the code there would have to be slightly tweaked for the rename once RHCOS inherits these changes. Though I'd like to also upstream that S3 prep logic into the buildprep command to abstract all this.

Copy link
Member

Choose a reason for hiding this comment

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

OK, thanks for confirming my thoughts. I'm OK with this change regardless; we can limp along with rhcos-4.1 for a while (at least until OpenShift 4 GA). 😉

Copy link
Member

@miabbott miabbott left a comment

Choose a reason for hiding this comment

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

LGTM

@cgwalters
Copy link
Member

Hmm...OK, I think we may be able to do a "schema change" and copy the object in old builds.

@jlebon
Copy link
Member Author

jlebon commented May 8, 2019

Hmm...OK, I think we may be able to do a "schema change" and copy the object in old builds.

Sorry, not sure I follow. Are you suggesting the code here retroactively doing this translation on previous build dirs? Or are you talking about the prepare-build side?

@cgwalters
Copy link
Member

I'm saying we write a one-off script to copy the object in old builds for RHCOS.

@dustymabe
Copy link
Member

Rename the OSTree commit object to ostree-commit-object to be more
explicit.

👍 - I like explicit

@jlebon
Copy link
Member Author

jlebon commented May 16, 2019

Going to merge this one. I pushed out a pull request internally to adapt to this change ahead of time.

@jlebon jlebon merged commit c3b281d into coreos:master May 16, 2019
@jlebon jlebon deleted the pr/rename-ostree-obj branch July 6, 2020 20:33
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