Commit graph

1218 commits

Author SHA1 Message Date
Miguel Martín
aabbd950b6
Use the 'branch' auto merge type in renovate's configuration.
Instead of crating MRs, renovate will:

- Create the branch, wait for test results
- Rebase it any time it gets out of date with the base branch
- Automerge the branch commit if it's:
    (a) up-to-date with the base branch, and
    (b) passing all tests
- As a backup, raise a PR only if either:
    (a) tests fail, or
    (b) tests remain pending for too long (default: 24 hours)

Resolves #62

Signed-off-by: Miguel Martín <mmartinv@redhat.com>
2025-06-27 15:37:01 +02:00
Miguel Martín
420f21b36d
Use 'renovate' prefix for all the branches created by konflux
Signed-off-by: Miguel Martín <mmartinv@redhat.com>
2025-06-27 15:37:01 +02:00
Miguel Martín
3e4fab9573
Add missing files which must trigger konflux builds
Changes in `bootc-base-imagectl` and `install-manifests` files
must trigger konflux builds for all the existing base images.

Also changes in "minimal" or "minimal-plus" must trigger konflux
builds in all the "standard" images.

Signed-off-by: Miguel Martín <mmartinv@redhat.com>
2025-06-27 15:37:01 +02:00
Miguel Martín
172a01a6a7
Make 'on-cel-expression' more readable
Signed-off-by: Miguel Martín <mmartinv@redhat.com>
2025-06-27 15:37:00 +02:00
platform-engineering Service account
43824ce37d Merge branch 'renovate/main-fedora-42-compose-dependencies' into 'main'
chore(deps): update quay.io/bootc-devel/fedora-bootc-42-compose:fedora-42-updates-testing-20250627.0 docker digest to 81904c2 (main)

See merge request fedora/bootc/base-images!229
2025-06-27 13:35:27 +00:00
platform-engineering Service account
438ba4ae89 Merge branch 'renovate/main-fedora-rawhide-compose-dependencies' into 'main'
chore(deps): update quay.io/bootc-devel/fedora-bootc-rawhide-compose docker tag to fedora-rawhide-20250627.n.0 (main)

See merge request fedora/bootc/base-images!230
2025-06-27 13:34:21 +00:00
Platform Engineering Bot
148fb35664 chore(deps): update quay.io/bootc-devel/fedora-bootc-rawhide-compose docker tag to fedora-rawhide-20250627.n.0
Signed-off-by: Platform Engineering Bot <platform-engineering@redhat.com>
2025-06-27 12:08:12 +00:00
Platform Engineering Bot
c6b38ec294 chore(deps): update quay.io/bootc-devel/fedora-bootc-42-compose:fedora-42-updates-testing-20250627.0 docker digest to 81904c2
Signed-off-by: Platform Engineering Bot <platform-engineering@redhat.com>
2025-06-27 12:08:08 +00:00
platform-engineering Service account
33b7c8eef3 Merge branch 'konflux/references/main' into 'main'
chore(deps): update konflux references to a39bc3e (main)

See merge request fedora/bootc/base-images!228
2025-06-27 11:38:05 +00:00
Platform Engineering Bot
4845fd46b0 chore(deps): update konflux references to a39bc3e
Signed-off-by: Platform Engineering Bot <platform-engineering@redhat.com>
2025-06-27 10:34:55 +00:00
platform-engineering Service account
8087c59aa5 Merge branch 'renovate/main-fedora-rawhide-compose-dependencies' into 'main'
chore(deps): update quay.io/bootc-devel/fedora-bootc-rawhide-compose docker tag to fedora-rawhide-20250626.n.0 (main)

See merge request fedora/bootc/base-images!227
2025-06-27 07:38:29 +00:00
platform-engineering Service account
1a7103dcf7 Merge branch 'renovate/main-fedora-42-compose-dependencies' into 'main'
chore(deps): update quay.io/bootc-devel/fedora-bootc-42-compose docker tag to fedora-42-updates-testing-20250627.0 (main)

See merge request fedora/bootc/base-images!226
2025-06-27 07:38:16 +00:00
Platform Engineering Bot
fbf65c0e10 chore(deps): update quay.io/bootc-devel/fedora-bootc-rawhide-compose docker tag to fedora-rawhide-20250626.n.0
Signed-off-by: Platform Engineering Bot <platform-engineering@redhat.com>
2025-06-27 05:30:58 +00:00
Platform Engineering Bot
62dc87060b chore(deps): update quay.io/bootc-devel/fedora-bootc-42-compose docker tag to fedora-42-updates-testing-20250627.0
Signed-off-by: Platform Engineering Bot <platform-engineering@redhat.com>
2025-06-27 05:30:37 +00:00
Timothée Ravier
a6eae6f98e ci: Add basic shellcheck, whitespace & format checks 2025-06-26 13:56:56 +02:00
Timothée Ravier
af23daadf1 tests: Remove whitespace at EOL 2025-06-26 13:44:06 +02:00
platform-engineering Service account
b457c4965d Merge branch 'renovate/main-fedora-rawhide-compose-dependencies' into 'main'
chore(deps): update quay.io/bootc-devel/fedora-bootc-rawhide-compose docker tag to fedora-rawhide-20250625.n.0 (main)

See merge request fedora/bootc/base-images!223
2025-06-25 13:36:11 +00:00
Platform Engineering Bot
7f182606fe chore(deps): update quay.io/bootc-devel/fedora-bootc-rawhide-compose docker tag to fedora-rawhide-20250625.n.0
Signed-off-by: Platform Engineering Bot <platform-engineering@redhat.com>
2025-06-25 10:39:40 +00:00
platform-engineering Service account
601fcb424c Merge branch 'renovate/main-fedora-42-compose-dependencies' into 'main'
chore(deps): update quay.io/bootc-devel/fedora-bootc-42-compose docker tag to fedora-42-updates-testing-20250625.0 (main)

See merge request fedora/bootc/base-images!222
2025-06-25 09:31:31 +00:00
Platform Engineering Bot
93c272d437 chore(deps): update quay.io/bootc-devel/fedora-bootc-42-compose docker tag to fedora-42-updates-testing-20250625.0
Signed-off-by: Platform Engineering Bot <platform-engineering@redhat.com>
2025-06-25 07:08:37 +00:00
platform-engineering Service account
559f22c843 Merge branch 'renovate/main-fedora-42-compose-dependencies' into 'main'
chore(deps): update quay.io/bootc-devel/fedora-bootc-42-compose docker tag to fedora-42-updates-testing-20250624.0 (main)

See merge request fedora/bootc/base-images!220
2025-06-24 13:32:42 +00:00
platform-engineering Service account
334dca4d38 Merge branch 'renovate/main-fedora-rawhide-compose-dependencies' into 'main'
chore(deps): update quay.io/bootc-devel/fedora-bootc-rawhide-compose docker tag to fedora-rawhide-20250623.n.0 (main)

See merge request fedora/bootc/base-images!221
2025-06-24 13:32:41 +00:00
Platform Engineering Bot
d9c389140f chore(deps): update quay.io/bootc-devel/fedora-bootc-rawhide-compose docker tag to fedora-rawhide-20250623.n.0
Signed-off-by: Platform Engineering Bot <platform-engineering@redhat.com>
2025-06-24 10:12:13 +00:00
Platform Engineering Bot
489c4cb710 chore(deps): update quay.io/bootc-devel/fedora-bootc-42-compose docker tag to fedora-42-updates-testing-20250624.0
Signed-off-by: Platform Engineering Bot <platform-engineering@redhat.com>
2025-06-24 10:11:42 +00:00
platform-engineering Service account
3bfde42dbb Merge branch 'renovate/main-fedora-42-compose-dependencies' into 'main'
chore(deps): update quay.io/bootc-devel/fedora-bootc-42-compose docker tag to fedora-42-updates-testing-20250623.0 (main)

See merge request fedora/bootc/base-images!219
2025-06-23 08:00:04 +00:00
Platform Engineering Bot
59f4c72205 chore(deps): update quay.io/bootc-devel/fedora-bootc-42-compose docker tag to fedora-42-updates-testing-20250623.0
Signed-off-by: Platform Engineering Bot <platform-engineering@redhat.com>
2025-06-23 07:08:33 +00:00
platform-engineering Service account
90e1372157 Merge branch 'renovate/main-fedora-rawhide-compose-dependencies' into 'main'
chore(deps): update quay.io/bootc-devel/fedora-bootc-rawhide-compose docker tag to fedora-rawhide-20250622.n.0 (main)

See merge request fedora/bootc/base-images!215
2025-06-23 06:35:18 +00:00
Platform Engineering Bot
3a25b5c908 chore(deps): update quay.io/bootc-devel/fedora-bootc-rawhide-compose docker tag to fedora-rawhide-20250622.n.0
Signed-off-by: Platform Engineering Bot <platform-engineering@redhat.com>
2025-06-22 09:03:07 +00:00
Jonathan Lebon
ffe9ae59a7 Merge branch 'dusty-unconditional-kexec-tools' into 'main'
standard/coreos-user-experience: unconditionalize kexec-tools

See merge request fedora/bootc/base-images!218
2025-06-21 00:39:52 +00:00
Dusty Mabe
2804ac870f
standard/coreos-user-experience: unconditionalize kexec-tools
kexec-tools has been built for riscv now so we can stop conditionalizing
the inclusion.
2025-06-20 17:22:36 -04:00
Jonathan Lebon
4371a6f5d7 Merge branch 'dusty-fix-sed-stdout' into 'main'
minimal/basic-fixes: redirect sed commands stdout > /dev/null

See merge request fedora/bootc/base-images!217
2025-06-20 19:48:52 +00:00
Dusty Mabe
489bcd8ca1
minimal/basic-fixes: redirect sed commands stdout > /dev/null
Not sure why but when you try to build c9s with rpm-ostree from
git main the change in [1] causes the sed commands here to exit
with a weird error:

```
sed: couldn't close stdout: Bad file descriptor
```

Let's just redirect to /dev/null for now and maybe we can drop
it longer term when c9s goes away. See also [2] where this was
reported.

[1] f4aecb9b62
[2] https://github.com/coreos/rpm-ostree/pull/5388#issuecomment-2971623787
2025-06-20 15:27:14 -04:00
platform-engineering Service account
9f64a918b4 Merge branch 'renovate/main-fedora-rawhide-compose-dependencies' into 'main'
chore(deps): update quay.io/bootc-devel/fedora-bootc-rawhide-compose docker tag to fedora-rawhide-20250619.n.0 (main)

See merge request fedora/bootc/base-images!206
2025-06-20 11:03:32 +00:00
Jonathan Lebon
7229926c02
bootc-base-imagectl: support --install packages with spaces
Those are more like package requests than package names, so things like
`foo > 1.0` should be supported.

Pass the install arguments through `shlex.quote`.
2025-06-19 20:01:50 -04:00
Jonathan Lebon
72209c6c1c
bootc-base-imagectl: sort imports 2025-06-19 20:01:28 -04:00
Platform Engineering Bot
73c91c7c26 chore(deps): update quay.io/bootc-devel/fedora-bootc-rawhide-compose docker tag to fedora-rawhide-20250619.n.0
Signed-off-by: Platform Engineering Bot <platform-engineering@redhat.com>
2025-06-19 09:35:22 +00:00
platform-engineering Service account
44962e575f Merge branch 'renovate/main-fedora-42-compose-dependencies' into 'main'
chore(deps): update quay.io/bootc-devel/fedora-bootc-42-compose docker tag to fedora-42-updates-testing-20250619.0 (main)

See merge request fedora/bootc/base-images!212
2025-06-19 07:37:38 +00:00
Platform Engineering Bot
cc0cb6f4fd chore(deps): update quay.io/bootc-devel/fedora-bootc-42-compose docker tag to fedora-42-updates-testing-20250619.0
Signed-off-by: Platform Engineering Bot <platform-engineering@redhat.com>
2025-06-19 06:07:20 +00:00
Colin Walters (Red Hat)
00d7084d74 Merge branch 'pr/minor-tweaks' into 'main'
Various tweaks as part of RHCOS container-native path work

See merge request fedora/bootc/base-images!209
2025-06-18 17:55:41 +00:00
Colin Walters (Red Hat)
4d7013a2cf Merge branch 'pr/tweak-links' into 'main'
Drop `fedora-` prefix from canonical manifests and hide minimal-plus

See merge request fedora/bootc/base-images!210
2025-06-17 20:43:07 +00:00
Jonathan Lebon
87eae9910e
bootc-base-imagectl: support hidden manifests, hide minimal-plus
We don't currently want the minimal-plus target to be user-facing. It's
intended only for other Fedora variants.

Let's support "hidden" manifests by having their names end in
`.hidden.yaml`. Then, make `minimal-plus` hidden.

I considered instead having them start with `.` to match
well-established semantics, but I don't like either that this hides them
from an `ls` in the git repo (or even with `-a`, puts them higher up
whereas I want it to be close to `minimal.yaml`).

I also considered leveraging the existing symlink hiding semantics, but
it also felt awkward to rename a file and add a symlink to it just for
the purpose of hiding it.
2025-06-17 15:46:08 -04:00
Jonathan Lebon
c2ff52a7cf
bootc-base-imagectl: simplify manifest path logic
The `if os.path.isdir(args.manifest)` bit dates from the introduction
of this script, but doesn't really work. I suspect the intent here was
to abstract over some manifests being top-level YAML files and others
being directories).

Except that:
1. The script didn't actually check the right path. It's checking
   `$PWD/{args.manifest}` instead of `$MANIFESTDIR/{args.manifest}`.
2. `list` doesn't have the equivalent logic to look for `manifest.yaml`
   files in subdirectories.
3. Nowadays, there is both a e.g. `standard.yaml` _and_ a
   `standard/manifest.yaml` directory. The established semantic there
   AIUI is that the top-level manifests are opinionated for a specific
   OS (Fedora/CentOS/RHEL), whereas the directories are shared across
   all of those.

So let's just nuke support for the directory path.
2025-06-17 15:32:25 -04:00
Jonathan Lebon
040f6319f5
Drop fedora- prefix from canonical manifests
It's confusing right now how the manifest names differ across
fedora-bootc, centos-bootc and rhel-bootc. Both rhel-bootc and
centos-bootc only use "bare" names like `minimal`, and `standard`, while
fedora-bootc prefixes everything with `fedora-`.

For FCOS/SCOS/RHCOS, it would be beneficial to maintain the same naming
across all of those.

Let's just match the naming here to the "bare" version. But add symlinks
so that we don't break the old names (but note that being symlinks, they
will no longer show up in `bootc-base-imagectl list`).
2025-06-17 15:32:25 -04:00
Jonathan Lebon
a750416a16 Merge branch 'dnf5-conditional' into 'main'
Move python3-libdnf to fedora only

See merge request fedora/bootc/base-images!172
2025-06-17 18:23:09 +00:00
Colin Walters
58570a1e60 Move python3-libdnf5 to fedora only
ref https://gitlab.com/redhat/centos-stream/containers/bootc/-/merge_requests/558#note_2492110138

Signed-off-by: Colin Walters <walters@verbum.org>
2025-06-17 12:52:34 -04:00
Miguel Martín
82b8ca7ba9 Merge branch 'renovate/main-fedora-42-compose-dependencies' into 'main'
chore(deps): update quay.io/bootc-devel/fedora-bootc-42-compose docker tag to fedora-42-updates-testing-20250617.0 (main)

See merge request fedora/bootc/base-images!211
2025-06-17 16:06:22 +02:00
Platform Engineering Bot
a0d499a91c chore(deps): update quay.io/bootc-devel/fedora-bootc-42-compose docker tag to fedora-42-updates-testing-20250617.0
Signed-off-by: Platform Engineering Bot <platform-engineering@redhat.com>
2025-06-17 11:39:18 +00:00
Jonathan Lebon
f4df7f6e15
bootc-base-imagectl: add --no-docs
This just connects to the `documentation` treefile key currently but is
essentially equivalent to dnf's `--no-docs` flag.
2025-06-16 14:07:24 -04:00
Jonathan Lebon
a3c83bd895
passwd/group: order by UID/GID
This makes it easier to diff against other definitions of this file
ordered the same deterministic way.
2025-06-16 14:02:07 -04:00
Miguel Martín
1392229442 Merge branch 'renovate/main-fedora-42-compose-dependencies' into 'main'
chore(deps): update quay.io/bootc-devel/fedora-bootc-42-compose docker tag to fedora-42-updates-testing-20250613.0 (main)

See merge request fedora/bootc/base-images!208
2025-06-16 10:55:46 +02:00