rpm-ostree

Author SHA1 Message Date

Author	SHA1	Message	Date
Colin Walters	a86ad96669	compose: Support not specifying a ref Split out of supporting "pure rojig" work. We also want to support this for doing "oscontainers" as is planned for Red Hat CoreOS. The user experience in both cases is oriented around versioning of the external wrapper, not the inner ref/commit. Note for users/builders who want to make use of this feature: You probably want to mirror the changes in our test suite here to use the compose JSON and parse the resulting `ostree-commit` out of that. Closes: #1603 Approved by: jlebon	2018-10-09 19:47:25 +00:00
Colin Walters	3d60a31aaa	Fix `include`: with machineid-compat and a few other keys It turns out we basically have to slap an `Option<T>` around everything, (in particular `bool` etc.) we need to be able to distinguish in (I believe) all the cases between "value unspecified" and "value provided". Concretely it didn't work to try to set `machineid-compat: false` in an included yaml treefile becuase it was just defaulted to `true` by the toplevel. Down the line we should move all of the parsing into Rust and have two different `struct` types for "YAML we load" versus "verified treefile". Closes: https://github.com/projectatomic/rpm-ostree/issues/1524 Closes: #1525 Approved by: lucab	2018-08-29 12:59:34 +00:00
Jonathan Lebon	dce98e4a53	tests/compose: Split out machineid-compat test My fix to the testsuite in #1488 in which I made the `machineid-compat` test part of `test-basic.sh` wasn't correct since the basic tests in `libbasic-test.sh` also check that the default behaviour without the `machineid-compat` option is to include it. Let's just do this right and split out the `machineid-compat` test into its own run. Closes: #1491 Approved by: cgwalters	2018-08-07 16:00:13 +00:00

Colin Walters

a86ad96669

compose: Support not specifying a ref

Split out of supporting "pure rojig" work.  We also want
to support this for doing "oscontainers" as is planned for
Red Hat CoreOS.  The user experience in both cases is oriented
around versioning of the external wrapper, not the inner ref/commit.

Note for users/builders who want to make use of this feature:
You probably want to mirror the changes in our test suite here to
use the compose JSON and parse the resulting `ostree-commit` out of that.

Closes: #1603
Approved by: jlebon

2018-10-09 19:47:25 +00:00

Colin Walters

3d60a31aaa

Fix include: with machineid-compat and a few other keys

It turns out we basically have to slap an `Option<T>` around
everything, (in particular `bool` etc.) we need to be able
to distinguish in (I believe) all the cases between
"value unspecified" and "value provided".

Concretely it didn't work to try to set `machineid-compat: false`
in an included yaml treefile becuase it was just defaulted to `true`
by the toplevel.

Down the line we should move all of the parsing into Rust
and have two different `struct` types for "YAML we load" versus
"verified treefile".

Closes: https://github.com/projectatomic/rpm-ostree/issues/1524

Closes: #1525
Approved by: lucab

2018-08-29 12:59:34 +00:00

Jonathan Lebon

dce98e4a53

tests/compose: Split out machineid-compat test

My fix to the testsuite in #1488 in which I made the `machineid-compat`
test part of `test-basic.sh` wasn't correct since the basic tests in
`libbasic-test.sh` also check that the default behaviour without the
`machineid-compat` option is to include it.

Let's just do this right and split out the `machineid-compat` test into
its own run.

Closes: #1491
Approved by: cgwalters

2018-08-07 16:00:13 +00:00

3 Commits