Commit Graph

6474 Commits

Author SHA1 Message Date
Colin Walters
25120bd7ad
Merge pull request #2912 from cgwalters/itest-transactionality-debug
tests/inst: A few small patches
2023-07-05 05:47:05 -04:00
Colin Walters
6172018090
Merge pull request #1633 from cgwalters/pkglibexec-tests
Drop "ostree trivial-httpd" CLI, move to tests directory
2023-07-05 04:51:29 -04:00
Colin Walters
9104c54f2b
Merge pull request #2905 from cgwalters/prepare-root-static-split
Separate prepare-root static path + link to glib
2023-07-04 09:05:31 -04:00
Colin Walters
0c36e8143d Drop "ostree trivial-httpd" CLI, move to tests directory
See https://github.com/ostreedev/ostree/issues/1593

Basically this makes it easier for people packaging, as the trivial-httpd
is only for tests, and this way the binary will live with the tests.

Also at this point nothing should depend on `ostree trivial-httpd`.
2023-07-04 08:18:24 -04:00
Colin Walters
8ad8a79c2a
Merge pull request #2916 from cgwalters/release
Release 2023.5
2023-06-30 15:07:15 -04:00
Colin Walters
b2cfee722e
Merge pull request #2914 from cgwalters/doc-usergroups
docs: Update user and group section
2023-06-30 11:49:30 -04:00
Colin Walters
5aadb6ec26 configure: post-release version bump 2023-06-30 11:10:25 -04:00
Colin Walters
26b833e90a Release 2023.5 2023-06-30 11:07:18 -04:00
Colin Walters
7d192d079a
Merge pull request #2899 from ostreedev/dependabot/submodules/composefs-412cb5e
build(deps): bump composefs from `08bdb03` to `412cb5e`
2023-06-30 11:01:59 -04:00
Colin Walters
875915f6c9 prepare-root: Link to glib
Since we've split off the "prepare root as init" code
into a separate file, we can now use glib to parse
the config file again, which is a lot less hacky.

This is particularly motivated by composefs, where
we want to do more in the initramfs.  Future patches
may also link to parts of libostree.
2023-06-30 05:18:23 -04:00
Colin Walters
d6799ecc24 Separate prepare-root static path
We should have done this a long time ago.  We don't have any test
coverage for the no-initramfs path, and I think it's not long
term supportable as we want to add more features like composefs.

Particularly now that there's good support for embedding an
initramfs in a kernel image, I see little value in a path for
having custom static linking for this prepare root flow.

That said, we will continue to make a best-effort "it compiles"
attempt to support it.

Fork the "pid 1" prepare root code into a new
`ostree-prepare-root-static.c` file, and drop the runtime conditionals.

We can drop the composefs logic from `-static.c` which ends up
keeping that file much smaller.

A further next step here will be to actually fold the
`prepare-root.c` logic into the main `ostree` binary which we
can then just include in the initramfs.
2023-06-30 05:18:23 -04:00
dependabot[bot]
6e5753f574
build(deps): bump composefs from 08bdb03 to 412cb5e
Bumps [composefs](https://github.com/containers/composefs) from `08bdb03` to `412cb5e`.
- [Release notes](https://github.com/containers/composefs/releases)
- [Commits](08bdb030fc...412cb5e6aa)

---
updated-dependencies:
- dependency-name: composefs
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-30 09:13:46 +00:00
Colin Walters
786e64ced7 docs: Update user and group section
- mention `DynamicUser=yes`
- mention the recent systemd JSON bits
- mention sysusers.doc

And briefly talk about the tradeoffs in these.
2023-06-29 11:05:31 -04:00
Dan Nicholson
c2ad2d23ae
Merge pull request #2911 from cgwalters/fix-generator-regression
Fix return value of generator on non-ostree systems
2023-06-29 02:16:52 -06:00
Colin Walters
8999d41127
Merge pull request #2910 from cgwalters/more-ci-fixes
ci: Fix executability
2023-06-29 02:38:00 -04:00
Colin Walters
8bba482bc8 tests: Enable mtime test
I think this just accidentally was never enabled.

While looking at the code, add a sleep here to be resilient to
filesystems with only second mtime granularity.
2023-06-29 02:11:09 -04:00
Colin Walters
0b519c2573 tests: Drop unused alias 2023-06-29 02:09:51 -04:00
Colin Walters
54c731554e tests/transactionality: Port a bit to xshell
This will give us more useful error messages which should
help debug a flake.
2023-06-29 02:08:56 -04:00
Joseph Marrero Corchado
a0d17a730d
Merge pull request #2907 from cgwalters/test-composefs
tests: Source libtest before exiting
2023-06-28 19:44:52 -04:00
Colin Walters
aeef8221c4 test-composefs: Sync flow with other tests
I am not sure why this is failing on older Debian systems,
but I'm wildly guessing that something being done in `libtest.sh`
is setting up automake in a way that we need.  This is done
in other tests.

Or maybe it's the missing `$CMD_PREFIX`?  Let's see...
2023-06-28 11:58:20 -04:00
Colin Walters
3c76d03af2 Fix return value of generator on non-ostree systems
Commit aa72caffb5
regressed the `ostree-system-generator` on non-ostree systems.
If there's no `ostree=` karg, we need to just exit 0.

Closes: https://github.com/ostreedev/ostree/issues/2909
Fixes: aa72caffb5
2023-06-28 11:45:15 -04:00
Colin Walters
531b4ab055 ci: Fix executability 2023-06-28 02:37:31 -04:00
Colin Walters
e0e2144e12
Merge pull request #2904 from cgwalters/prow-ci
ci/prow: Build tests before trying to install
2023-06-27 17:16:18 -04:00
Joseph Marrero Corchado
88e399a780
Merge pull request #2906 from cgwalters/compiletest-static-prepareroot
ci: Add "it compiles" coverage for --with-static-compiler
2023-06-27 09:55:15 -04:00
Colin Walters
6ed6a7e699 ci: Add "it compiles" coverage for --with-static-compiler
Prep for further changes.
2023-06-27 06:36:52 -04:00
Colin Walters
5e2b5aca40 ci/prow: Build tests before trying to install
Our `install` target doesn't depend on `all` unlike the
rpm-ostree version; not doing so is arguably better, so let's
explicitly build before installing.
2023-06-27 05:27:23 -04:00
Colin Walters
132bb6a82e
Merge pull request #2902 from ericcurtin/ostree-aboot-pass-options
bootloader: Pass "options" to aboot bootloader backend
2023-06-27 02:50:49 -04:00
Colin Walters
8deb97a778
Merge pull request #2901 from cgwalters/revert-fetcher-change
Revert "fetcher: Always open tmpfiles in repo location"
2023-06-27 00:18:17 -04:00
Colin Walters
4e61e6f7d0 Revert "fetcher: Always open tmpfiles in repo location"
This reverts commit f7f6f87c51.

This seems to have broken flatpak, so we'll revert and then
investigate.

Closes: https://github.com/ostreedev/ostree/issues/2900
2023-06-26 21:03:10 -06:00
Dan Nicholson
7a91035c09
Merge pull request #2903 from dbnicholson/composefs-digest-fix
prepare-root: Adjust to composefs mount struct changes
2023-06-26 17:08:48 -06:00
Dan Nicholson
94b49b41e7 prepare-root: Adjust to composefs mount struct changes
This fixes a regression from the latest composefs submodule update in
1582edd1d4. In composefs commit
7560a4fd388481f479c0b3fc2e6d20c6321d9b74 the struct field was changed
from the generic `expected_digest` with the thought that there may be
other signatures or digests in the future.
2023-06-26 09:47:00 -06:00
Eric Curtin
4429923681 bootloader: Pass "options" to aboot bootloader backend
aboot-deploy must know where the next root filesystem to boot is to set
up a symlink /ostree/root.a or /ostree/root.b , this location is in the
ostree= part of these passed in options.

Signed-off-by: Eric Curtin <ecurtin@redhat.com>
2023-06-26 11:44:56 +01:00
Colin Walters
363a1f14a8
Merge pull request #2896 from akiernan/main
lib/deploy: Use off_t not __off_t
2023-06-21 08:06:52 -04:00
Alex Kiernan
e0342d2da1 lib/deploy: Use off_t not __off_t
Not clear why this was __off_t which is the sole appearance in the code
base, but it breaks musl builds.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
2023-06-21 07:31:14 +01:00
Joseph Marrero Corchado
24dd9bbe02
Merge pull request #2895 from cgwalters/release
Release 2023.4
2023-06-20 12:25:17 -04:00
Joseph Marrero Corchado
f07c93e167
Merge pull request #2893 from cgwalters/update-prow-config
ci: Add some composefs testing
2023-06-20 12:22:49 -04:00
Colin Walters
ebb9624204
Merge pull request #2892 from ostreedev/dependabot/submodules/composefs-08bdb03
build(deps): bump composefs from `c9188cd` to `08bdb03`
2023-06-20 11:01:57 -04:00
Colin Walters
a6035125d5 configure: post-release version bump 2023-06-20 09:39:43 -04:00
Colin Walters
0c35149c7e Release 2023.4 2023-06-20 09:39:04 -04:00
Colin Walters
a113b2be3f
Merge pull request #2891 from cgwalters/commit-compute-composefs-digest
lib: Rework composefs metadata, drop custom signatures
2023-06-20 07:44:38 -04:00
Colin Walters
6df69880de ci: Sync prow config with rpm-ostree, enable composefs there
I want to gain testing over the composefs path; but without
yet changing the main Jenkins build.  Because we have duplicate/overlapping
CI systems, we can take advantage of this by testing the composefs
flow via Prow.

Sync the Prow build scripts with what's in coreos/rpm-ostree
right now.

Then let's test the composefs flow a bit more e2e there.
2023-06-19 19:07:01 -04:00
Colin Walters
3c7e256cee tests: Add a sanity check for composefs
Prep for adding some coverage of this flow when booting with
composefs.
2023-06-19 19:02:20 -04:00
Colin Walters
b56da3409d docs/composefs: Updates
- fix URL
- Document requirements
- Document kernel argument
- Adjust for recent changes
2023-06-19 17:29:31 -04:00
dependabot[bot]
1582edd1d4
build(deps): bump composefs from c9188cd to 08bdb03
Bumps [composefs](https://github.com/containers/composefs) from `c9188cd` to `08bdb03`.
- [Release notes](https://github.com/containers/composefs/releases)
- [Commits](c9188cd1f8...08bdb030fc)

---
updated-dependencies:
- dependency-name: composefs
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-19 12:59:34 +00:00
Colin Walters
a6f2d053c8 lib: Rework composefs metadata, drop custom signatures
We will be switching to handling signature verification of
the target ostree commit.
2023-06-17 17:08:46 -04:00
Colin Walters
dd47090e2f
Merge pull request #2890 from cgwalters/composefs-err-frees
composefs: Avoid double free in error path
2023-06-17 11:30:49 -04:00
Colin Walters
79adccee38 composefs: Avoid double unref
The interaction of `iter_loop` and autofree is way too subtle;
I happened to be reading this code and noticed we did the NULL
reset in one path but not another.

The real fix is Rust...
2023-06-17 09:11:51 -04:00
Joseph Marrero Corchado
1fe2bb9f5a
Merge pull request #2885 from cgwalters/doc-composefs
composefs: Add some basic docs
2023-06-16 14:26:01 -04:00
Colin Walters
95f2c72c9f
Merge pull request #2886 from daissi/wip/daissi/disable-http2
ostree-fetcher-curl: explicitly use HTTP1.1 when HTTP2 is disabled
2023-06-15 17:35:45 -04:00
Dan Nicholson
186055d6dd
Merge pull request #2888 from cgwalters/more-error-prefixing
Add more error prefixing when parsing commit objects
2023-06-15 13:25:12 -06:00