Skip to content

Commit b7e75bd

Browse files
dustymabejlebon
authored andcommitted
promote container signature verification and migration to it
This has rolled out on the `next` stream. Let's now promote it to our other streams and let the normal promotion progress (i.e. testing-devel -> testing -> stable) take place. Part of coreos/fedora-coreos-tracker#2029
1 parent c173256 commit b7e75bd

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

image-base.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ platform-compressor:
3535
digitalocean: gzip
3636

3737
# Set container-imgref
38-
container-imgref: "ostree-remote-registry:fedora:quay.io/fedora/fedora-coreos:{stream}"
38+
container-imgref: "ostree-image-signed:docker://quay.io/fedora/fedora-coreos:{stream}"
3939

4040
# Enable 'erofs' by default for the rootfs in the Live ISO/PXE artifacts
4141
live-rootfs-fstype: "erofs"

manifests/fedora-coreos.yaml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,30 +54,17 @@ conditional-include:
5454
include:
5555
ostree-layers:
5656
- overlay/50alternatives
57-
# Add container signing configuration. Initially rolling this out only
58-
# to `next`, `next-devel` and mechanical streams.
59-
- if:
60-
- stream != "stable"
61-
- stream != "testing"
62-
- stream != "testing-devel"
63-
include:
64-
ostree-layers:
65-
- overlay/17fcos-container-signing
6657
# Perform migration to container signing versus ostree commit signing.
6758
# This is a requirement for moving to build-via-container in F43,
68-
# thus it must happen before the switch to F43. Initially rolling out
69-
# to `next` and `next-devel`.
70-
- if:
71-
- stream != "stable"
72-
- stream != "testing"
73-
- stream != "testing-devel"
74-
- releasever < 43
59+
# thus it must happen before the switch to F43.
60+
- if: releasever < 43
7561
include:
7662
ostree-layers:
7763
- overlay/35container-signing-migration
7864

7965
ostree-layers:
8066
- overlay/15fcos
67+
- overlay/17fcos-container-signing
8168

8269
automatic-version-prefix: "${releasever}.<date:%Y%m%d>.dev"
8370
mutate-os-release: "${releasever}"

0 commit comments

Comments
 (0)