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

Move to Fedora 31! #200

Merged
merged 7 commits into from
Oct 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .cci.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ coreos.pod([image: "quay.io/coreos-assembler/coreos-assembler:latest", kvm: true
stage("Kola") {
dir("cosa") {
coreos.shwrap("""
cosa kola run
# This is known to fail right now. See:
# https://github.com/coreos/fedora-coreos-tracker/issues/280
# https://github.com/coreos/mantle/issues/1103
cosa kola -- run --blacklist-test fcos.python
""")
}
}
Expand Down
17 changes: 17 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,20 @@ one easy way to do this is for now:
- add packages to the correct YAML manifest
- run `cosa fetch --update-lockfile`
- commit only the new package entries

## Moving to a new major version of Fedora

Updating this repo itself is easy:

1. bump `releasever` in `manifest.yaml`
2. update the repos in `manifest.yaml` if needed
3. run `cosa fetch --update-lockfile`
4. PR the result

Though there are also some releng-related knobs that may need changes:

1. verify that the `f${releasever}-coreos-signing-pending` Koji tag has
been created
2. update RoboSignatory config so that:
- [tagged packages are signed with the right key](https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/roles/robosignatory/templates/robosignatory.toml.j2?id=c27f4644d4bc2f7916c9c85dc1c1a9ee9a724cc0#n181)
- [CoreOS artifacts are signed with the right key](https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/roles/robosignatory/templates/robosignatory.toml.j2?id=c27f4644d4bc2f7916c9c85dc1c1a9ee9a724cc0#n458)
5 changes: 4 additions & 1 deletion fedora-coreos-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ remove-from-packages:
/usr/lib/systemd/system/systemd-networkd-wait-online.service]
- [systemd-container, /usr/lib/systemd/network/.*]
- [systemd-udev, /usr/lib/systemd/network/.*]
# We're still using the legacy dracut network module for now. Dracut keys off
# of this: https://github.com/dracutdevs/dracut/blob/1fcc70fe57eea0ea658aa2de5c0044683fe85cf1/modules.d/40network/module-setup.sh#L11
- [NetworkManager, /usr/libexec/nm-initrd-generator]


remove-files:
Expand Down Expand Up @@ -122,7 +125,7 @@ packages:
- cryptsetup
- cifs-utils
# Time sync
- chrony timedatex
- chrony
# Extra runtime
- sssd shadow-utils
- logrotate
Expand Down
3 changes: 3 additions & 0 deletions image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ size: 8
extra-kargs:
# Disable SMT on systems vulnerable to MDS or any similar future issue.
- mitigations=auto,nosmt
# https://github.com/coreos/fedora-coreos-tracker/issues/292
# https://fedoraproject.org/wiki/Changes/CGroupsV2
- systemd.unified_cgroup_hierarchy=0


# Optional remote by which to prefix the deployed OSTree ref
Expand Down
3 changes: 3 additions & 0 deletions manifest-lock.overrides.x86_64.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"packages": {
"podman": {
"evra": "2:1.5.1-3.git0005792.fc31.x86_64"
}
}
}
Loading