Inherit from fedora-bootc's tier-x on Fedora 42+ #3177
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| name: Bump fedora-bootc submodule | ||
|
|
||
| on: | ||
| schedule: | ||
| - cron: '0 */6 * * *' | ||
| workflow_dispatch: | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| jobs: | ||
| bump-fedora-bootc-submodule: | ||
| name: Bump fedora-bootc submodule | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| submodules: true | ||
| fetch-depth: 0 | ||
| # https://github.com/actions/checkout/issues/766 | ||
| - name: Mark git checkout as safe | ||
| run: git config --global --add safe.directory "$GITHUB_WORKSPACE" | ||
| - name: Check if there are new commits | ||
| run: | | ||
| previous_rev=$(git -C fedora-bootc rev-parse HEAD) | ||
| git submodule update --remote fedora-bootc | ||
| new_rev=$(git -C fedora-bootc rev-parse HEAD) | ||
| if [ "${previous_rev}" != "${new_rev}" ]; then | ||
| if git -C fedora-bootc diff --quiet "${previous_rev}" "${new_rev}" tier-0 tier-x; then | ||
| # reset back any changes to avoid a PR bump | ||
| git submodule update | ||
| fi | ||
| fi | ||
| if git diff --quiet --exit-code; then | ||
| echo "No tier-0 or tier-x changes; exiting" | ||
| exit 0 | ||
| fi | ||
|
|
||
| git -C fedora-bootc shortlog --no-merges "${previous_rev}..${new_rev}" -- tier-0 tier-x > $RUNNER_TEMP/shortlog | ||
|
|
||
| marker=END-OF-LOG-MARKER-$RANDOM$RANDOM$RANDOM | ||
| cat >> $GITHUB_ENV <<EOF | ||
| SHORTLOG<<$marker | ||
| $(cat $RUNNER_TEMP/shortlog) | ||
| $marker | ||
| EOF | ||
| - name: Open pull request | ||
| uses: peter-evans/create-pull-request@v6 | ||
| with: | ||
| token: ${{ secrets.COREOSBOT_RELENG_TOKEN }} | ||
| push-to-fork: coreosbot-releng/fedora-coreos-config | ||
| branch: bump-fedora-bootc | ||
| commit-message: | | ||
| Bump fedora-bootc submodule | ||
|
|
||
| ${{ env.SHORTLOG }} | ||
| title: "Bump fedora-bootc submodule" | ||
| body: | | ||
| Created by [GitHub workflow](${{ github.server_url }}/${{ github.repository }}/actions/workflows/bump-fedora-bootc.yml) ([source](${{ github.server_url }}/${{ github.repository }}/blob/testing-devel/.github/workflows/bump-fedora-bootc.yml)). | ||
|
|
||
| ``` | ||
| ${{ env.SHORTLOG }} | ||
| ``` | ||
| committer: "CoreOS Bot <[email protected]>" | ||
| author: "CoreOS Bot <[email protected]>" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| [submodule "fedora-bootc"] | ||
| path = fedora-bootc | ||
| url = https://gitlab.com/fedora/bootc/base-images.git |
Submodule fedora-bootc
added at
7b7c32
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| # This manifest can go away in Fedora 42. It duplicates tier-x. | ||
|
|
||
| # Modern defaults we want | ||
| boot-location: modules | ||
| tmp-is-dir: true | ||
|
|
||
| # Required by Ignition, and makes the system not compatible with Anaconda | ||
| machineid-compat: false | ||
|
|
||
| remove-from-packages: | ||
| # We don't want systemd-firstboot.service. It conceptually conflicts with | ||
| # Ignition. We also inject runtime bits to disable it in systemd-firstboot.service.d/fcos-disable.conf | ||
| # to make it easier to use systemd builds from git. | ||
| - [systemd, /usr/lib/systemd/system/sysinit.target.wants/systemd-firstboot.service] | ||
| # We don't want auto-generated mount units. See also | ||
| # https://github.com/systemd/systemd/issues/13099 | ||
| - [systemd-udev, /usr/lib/systemd/system-generators/systemd-gpt-auto-generator] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| # This manifest can go away in Fedora 42. It duplicates tier-x. | ||
|
|
||
| packages: | ||
| # Standard tools for configuring network/hostname | ||
| - NetworkManager hostname | ||
| - iproute | ||
| # Firewall manipulation | ||
| - iptables |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| # This manifest can go away in Fedora 42. It duplicates tier-x. | ||
|
|
||
| packages: | ||
| - cryptsetup | ||
| - e2fsprogs | ||
| - lvm2 | ||
| - xfsprogs | ||
| # SELinux policy | ||
| - selinux-policy-targeted | ||
| # Allow for configuring different timezones | ||
| - tzdata | ||
| # zram-generator (but not zram-generator-defaults) for F33 change | ||
| # https://github.com/coreos/fedora-coreos-tracker/issues/509 | ||
| - zram-generator |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| # All of these manifests duplicate tier-x. It's meant to be included by streams | ||
| # which do not yet inherit from it (like FCOS <42, and "traditional" RHCOS) | ||
|
|
||
| include: | ||
| - bootable-rpm-ostree.yaml | ||
| - ignition-and-ostree-tier-x-dupes.yaml | ||
| - system-configuration-tier-x-dupes.yaml | ||
| - networking-tools-tier-x-dupes.yaml | ||
| - user-experience-tier-x-dupes.yaml | ||
| # See https://github.com/coreos/bootupd | ||
| - bootupd.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| # Here, we include tier-x, but override some key settings. | ||
|
|
||
| include: ../fedora-bootc/tier-x/manifest.yaml | ||
|
|
||
| # Required by Ignition, and makes the system not compatible with Anaconda. | ||
| # Note this deviates from fedora-bootc and means `systemctl enable` doesn't | ||
| # work in a container build. We'll have to resolve that issue some other way in | ||
| # the future... For more details, see | ||
| # https://github.com/CentOS/centos-bootc/issues/167 | ||
| machineid-compat: false | ||
|
|
||
| # This is the historical default and what FCOS currently ships. fedora-bootc | ||
| # uses the new `root` value, but migrating FCOS is not that simple... | ||
| opt-usrlocal: var | ||
|
|
||
| postprocess: | ||
| - | | ||
| #!/usr/bin/env bash | ||
| set -euo pipefail | ||
| # For now, rely on the `sysroot.readonly` knob in /ostree/config only. | ||
| # Having it in prepare-root.conf too throws off ostree-prepare-root in | ||
| # live PXE/ISO and we have no easy way to override it when building those. | ||
| # Really, we need to fix libostree + live ISOs to work well together: | ||
| # https://github.com/ostreedev/ostree/issues/1921 | ||
| # It's awkward to edit arbitrary keyfile configs. Just rewrite it. | ||
|
Comment on lines
+20
to
+25
There was a problem hiding this comment. I guess my question here is what is the plan to get away from doing this other than fixing |
||
| if grep -q readonly /usr/lib/ostree/prepare-root.conf; then | ||
| grep -q '^4 ' <(wc -l /usr/lib/ostree/prepare-root.conf) | ||
|
There was a problem hiding this comment. It's verifying that the canonical file hasn't changed: https://gitlab.com/fedora/bootc/base-images/-/blob/main/tier-0/ostree.yaml I guess I could've checksummed it instead. |
||
| cat > /usr/lib/ostree/prepare-root.conf <<EOF | ||
| [composefs] | ||
| enabled = true | ||
| EOF | ||
| fi | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| # This manifest can go away in Fedora 42. It duplicates tier-x. | ||
|
|
||
| # Default to `bash` in our container, the same as other containers we ship. | ||
| # Note this changes to /sbin/init in f42 as inherited by tier-x. | ||
|
There was a problem hiding this comment. does this make the generated container not There was a problem hiding this comment. Though more precisely it is still |
||
| container-cmd: | ||
| - /usr/bin/bash | ||
|
|
||
| packages: | ||
| # Basic user tools | ||
| - bash-completion | ||
| - coreutils | ||
| # jq - parsing/interacting with JSON data | ||
| - jq | ||
| - less | ||
| - sudo | ||
| - vim-minimal | ||
| # File compression/decompression | ||
| - tar | ||
| # Remote Access | ||
| - openssh-clients openssh-server | ||
| # Container tooling | ||
| ## crun recommends but doesn't require criu and criu-libs. We want them for | ||
| ## checkpoint/restore. https://github.com/coreos/fedora-coreos-tracker/issues/1370 | ||
| - crun criu criu-libs | ||
| - podman | ||
| - skopeo | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is also in
manifests/tier-x.yamlThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, this is by design. We need to keep this manifest until we only have tier-x. It's only included in the < 42 path.