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

status: Render ostree metadata source-title key #1069

Closed
wants to merge 3 commits into from

Conversation

cgwalters
Copy link
Member

Depends: ostreedev/ostree#1296

As I mention in the commit there, I see two uses for this in rpm-ostree; first
in our test suite, and second for OCI-built image imports.

I also took a step further here and inject an original-origin metadata
key, though we aren't actually using that yet. The problem I'm trying
to solve there is that repeated make vmoverlay starts chaining things up,
but that gets very confusing. I think we should always have vmoverlay unwind
back to the base ref. (Or at least do that by default)

@cgwalters
Copy link
Member Author

# rpm-ostree status
State: idle
Deployments:
● vmcheck
  └ Dev overlay on fedora-atomic:fedora/26/x86_64/atomic-host
                 Timestamp: 2017-10-19 19:27:07
                    Commit: 479b552a31da9504d8910a52cd032a4faf6fd22bd8da835b149d82a99b0e9e90

@jlebon
Copy link
Member

jlebon commented Oct 23, 2017

bot, retest this please

@cgwalters cgwalters force-pushed the commit-source-title branch from 6cc4b0b to 226e7f0 Compare October 23, 2017 19:34
@cgwalters
Copy link
Member Author

I reworked this on top of a prep commit that passes through the (ostree) commit metadata in a more generic way ⬆️

Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

Hmm, test-basic.sh is being scary: 👻

**
GLib:ERROR:gvarianttypeinfo.c:163:g_variant_type_info_check: assertion failed: (info->alignment == 0 || info->alignment == 1 || info->alignment == 3 || info->alignment == 7)
/var/tmp/checkout/tests/check/test-basic.sh: line 52: 18686 Aborted                 (core dumped) rpm-ostree status > status.txt
ok status shows right version

* of the commit metadata.
*/
{ g_autoptr(GVariant) base_meta = g_variant_get_child_value (commit, 0);
g_variant_dict_insert (&dict, "commit-meta", "@a{sv}", base_meta);
Copy link
Member

Choose a reason for hiding this comment

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

Minor: let's call this base-commit-meta and the other one simply commit-meta to be more consistent?

Copy link
Member Author

Choose a reason for hiding this comment

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

I was thinking that now that we're de-emphasizing the final commit a bit, using the more explicit naming for "base"/"layered" is clearer. So perhaps change this key to "base-commit-meta"?

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, that makes sense!

In another PR I did the manual bridging of commit metadata to deployment
property, but that's annoying. Let's just bridge all commit metadata.
Depends: ostreedev/ostree#1296

As I mention in the commit there, I see two uses for this in rpm-ostree; first
in our test suite, and second for OCI-built image imports.

I also took a step further here and inject an `original-origin` metadata
key, though we aren't actually using that yet.  The problem I'm trying
to solve there is that repeated `make vmoverlay` starts chaining things up,
but that gets very confusing.  I think we should always have `vmoverlay` unwind
back to the base ref.  (Or at least do that by default)
@cgwalters cgwalters force-pushed the commit-source-title branch from 226e7f0 to 92d3311 Compare October 24, 2017 16:12
@jlebon
Copy link
Member

jlebon commented Oct 25, 2017

@rh-atomic-bot r+ 230a095

@rh-atomic-bot
Copy link

⌛ Testing commit 230a095 with merge 1f31cbb...

rh-atomic-bot pushed a commit that referenced this pull request Oct 25, 2017
Depends: ostreedev/ostree#1296

As I mention in the commit there, I see two uses for this in rpm-ostree; first
in our test suite, and second for OCI-built image imports.

I also took a step further here and inject an `original-origin` metadata
key, though we aren't actually using that yet.  The problem I'm trying
to solve there is that repeated `make vmoverlay` starts chaining things up,
but that gets very confusing.  I think we should always have `vmoverlay` unwind
back to the base ref.  (Or at least do that by default)

Closes: #1069
Approved by: jlebon
@rh-atomic-bot
Copy link

☀️ Test successful - status-atomicjenkins
Approved by: jlebon
Pushing 1f31cbb to master...

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.

3 participants