Skip to content
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
publish-images:
strategy:
matrix:
test_os: [fedora-43, fedora-44, fedora-45, centos-9, centos-10]
test_os: [fedora-43, fedora-44, fedora-45, fedora-46, centos-9, centos-10]

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's drop fedora-43 too our matrix is already way way too big. IOW rule is "At most 3 fedoras"? and we just stop updating fedora-43 `

variant: [ostree, composefs-sealeduki-sdboot]
exclude:
# centos-9 UKI is experimental/broken (https://github.com/bootc-dev/bootc/issues/1812)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:
|| [[ "$EVENT" == "pull_request" && "$MERGE_QUEUE_ENABLED" != "true" ]] \
|| echo "$LABELS" | jq -e 'index("ci/merge")' > /dev/null; }; then
# Full suite: all OSes
echo 'package_os_matrix=["fedora-43","fedora-44","fedora-45","centos-9","centos-10"]' >> "$GITHUB_OUTPUT"
echo 'package_os_matrix=["fedora-43","fedora-44","fedora-45","fedora-46","centos-9","centos-10"]' >> "$GITHUB_OUTPUT"

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really need to dedup these lists, but at least a comment "keep in sync with " is a good comment to add

echo 'integration_os_matrix=["fedora-43","fedora-44","centos-9","centos-10"]' >> "$GITHUB_OUTPUT"
echo 'upgrade_os_matrix=["fedora-44","centos-10"]' >> "$GITHUB_OUTPUT"
echo 'run_heavy=true' >> "$GITHUB_OUTPUT"
Expand Down Expand Up @@ -254,7 +254,7 @@ jobs:

runs-on: ubuntu-24.04
# Rawhide is best-effort; don't let it block merges
continue-on-error: ${{ matrix.test_os == 'fedora-45' }}
continue-on-error: ${{ matrix.test_os == 'fedora-46' }}

steps:
- uses: actions/checkout@v7
Expand Down
6 changes: 6 additions & 0 deletions .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ jobs:
- fedora-44-aarch64
# s390x disabled: https://github.com/fedora-copr/copr/issues/4219
# - fedora-44-s390x
- fedora-45-x86_64
- fedora-45-aarch64
# s390x disabled: https://github.com/fedora-copr/copr/issues/4219
# - fedora-45-s390x
- fedora-rawhide-x86_64
- fedora-rawhide-aarch64
# Temporarily disabled due to too old Rust...reenable post 9.6
Expand Down Expand Up @@ -125,6 +129,8 @@ jobs:
- fedora-43-aarch64
- fedora-44-x86_64
- fedora-44-aarch64
- fedora-45-x86_64
- fedora-45-aarch64
- fedora-rawhide-x86_64
- fedora-rawhide-aarch64
tmt_plan: /tmt/plans/integration
Expand Down
6 changes: 4 additions & 2 deletions hack/os-image-map.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,16 @@
"fedora-42": "quay.io/fedora/fedora-bootc:42",
"fedora-43": "quay.io/fedora/fedora-bootc:43",
"fedora-44": "quay.io/fedora/fedora-bootc:44",
"fedora-45": "quay.io/fedora/fedora-bootc:45"
"fedora-45": "quay.io/fedora/fedora-bootc:45",
"fedora-46": "quay.io/fedora/fedora-bootc:46"
},
"buildroot-base": {
"centos-9": "quay.io/centos/centos:stream9",
"centos-10": "quay.io/centos/centos:stream10",
"fedora-42": "quay.io/fedora/fedora:42",
"fedora-43": "quay.io/fedora/fedora:43",
"fedora-44": "quay.io/fedora/fedora:44",
"fedora-45": "quay.io/fedora/fedora:45"
"fedora-45": "quay.io/fedora/fedora:45",
"fedora-46": "quay.io/fedora/fedora:46"
}
}
Loading