Skip to content

Commit 10a4cdb

Browse files
inffybsherman
inffy
and
bsherman
authored
chore(ci): enable F43 coreOS stable builds (#418)
* enable F43 coreOS stable builds * keep coreos-testing on F43, drop CentOS kmods SIG builds Fedora CoreOS is now F43 for both stable and testing, so also remove longterm-6.12 from F42. For same reason keep building both stable and testing kmods for coreos F43. centos-kmodsig are no longer in use by bluefin-lts, thus removing to avoid noise. Also, nvidia kmods are now only built when with a repo validated nvidia-driver version. --------- Co-authored-by: Benjamin Sherman <[email protected]>
1 parent b2b4e9b commit 10a4cdb

File tree

6 files changed

+104
-106
lines changed

6 files changed

+104
-106
lines changed

‎.github/workflows/build-akmods-centos-kmodsig.yml‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

‎.github/workflows/build-akmods-coreos-stable.yml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,93 @@ on:
1616
- cron: '19 0 * * *' # 0019 UTC everyday
1717
workflow_dispatch:
1818
jobs:
19+
cache_kernel_coreos-stable_43:
20+
name: Cache coreos-stable (43)
21+
uses: ./.github/workflows/reusable-cache-kernel.yml
22+
secrets: inherit
23+
permissions:
24+
actions: read
25+
contents: read
26+
packages: write
27+
with:
28+
architecture: '["aarch64","x86_64"]'
29+
kernel_flavor: coreos-stable
30+
version: 43
31+
build-coreos-stable_43_common:
32+
name: Build common coreos-stable (43)
33+
uses: ./.github/workflows/reusable-build.yml
34+
secrets: inherit
35+
permissions:
36+
actions: read
37+
contents: read
38+
packages: write
39+
needs: cache_kernel_coreos-stable_43
40+
with:
41+
akmods_target: common
42+
architecture: '["aarch64","x86_64"]'
43+
kernel_cache_key: ${{ needs.cache_kernel_coreos-stable_43.outputs.KCKEY }}
44+
kernel_flavor: coreos-stable
45+
version: 43
46+
build-coreos-stable_43_nvidia:
47+
name: Build nvidia coreos-stable (43)
48+
uses: ./.github/workflows/reusable-build.yml
49+
secrets: inherit
50+
permissions:
51+
actions: read
52+
contents: read
53+
packages: write
54+
needs: cache_kernel_coreos-stable_43
55+
with:
56+
akmods_target: nvidia
57+
architecture: '["aarch64","x86_64"]'
58+
kernel_cache_key: ${{ needs.cache_kernel_coreos-stable_43.outputs.KCKEY }}
59+
kernel_flavor: coreos-stable
60+
version: 43
61+
build-coreos-stable_43_nvidia-open:
62+
name: Build nvidia-open coreos-stable (43)
63+
uses: ./.github/workflows/reusable-build.yml
64+
secrets: inherit
65+
permissions:
66+
actions: read
67+
contents: read
68+
packages: write
69+
needs: cache_kernel_coreos-stable_43
70+
with:
71+
akmods_target: nvidia-open
72+
architecture: '["aarch64","x86_64"]'
73+
kernel_cache_key: ${{ needs.cache_kernel_coreos-stable_43.outputs.KCKEY }}
74+
kernel_flavor: coreos-stable
75+
version: 43
76+
build-coreos-stable_43_zfs:
77+
name: Build zfs coreos-stable (43)
78+
uses: ./.github/workflows/reusable-build.yml
79+
secrets: inherit
80+
permissions:
81+
actions: read
82+
contents: read
83+
packages: write
84+
needs: cache_kernel_coreos-stable_43
85+
with:
86+
akmods_target: zfs
87+
architecture: '["aarch64","x86_64"]'
88+
kernel_cache_key: ${{ needs.cache_kernel_coreos-stable_43.outputs.KCKEY }}
89+
kernel_flavor: coreos-stable
90+
version: 43
91+
check-coreos-stable_43:
92+
name: Check coreos-stable (43)
93+
permissions:
94+
actions: read
95+
contents: read
96+
needs: [build-coreos-stable_43_common,build-coreos-stable_43_nvidia,build-coreos-stable_43_nvidia-open,build-coreos-stable_43_zfs]
97+
runs-on: ubuntu-24.04
98+
if: always()
99+
steps:
100+
- name: Check for Build Failures
101+
if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'skipped')
102+
run: exit 1
103+
104+
- name: Exit if Success
105+
run: exit 0
19106
cache_kernel_coreos-stable_42:
20107
name: Cache coreos-stable (42)
21108
uses: ./.github/workflows/reusable-cache-kernel.yml

‎build_files/nvidia/build-kmod-nvidia.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,13 @@ cd /tmp
2222

2323
### BUILD nvidia
2424

25+
# query latest available driver in repo
26+
DRIVER_VERSION=$(dnf info nvidia-driver | grep -E '^Version|^Release' | awk '{print $3}' | xargs | sed 's/\ /-/')
27+
28+
# only install the version of akmod-nviida which matches available nvidia-driver
29+
# this works around situations where a new version may be released but not for one arch
2530
dnf install -y \
26-
"akmod-nvidia*.${DIST}.${ARCH}"
31+
"akmod-nvidia-${DRIVER_VERSION}"
2732

2833
# Either successfully build and install the kernel modules, or fail early with debug output
2934
rpm -qa |grep nvidia

‎build_files/prep/build-prep.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ echo "Installing ${KERNEL_FLAVOR} kernel-cache RPMs..."
4242
#shellcheck disable=SC2046 #we want word splitting
4343
dnf install -y --allowerasing --setopt=install_weak_deps=False "${PREP_RPMS[@]}" $(find /tmp/kernel_cache/*.rpm -type f | grep "$(uname -m)" | grep -v uki | xargs)
4444

45-
# after F43 launches, bump to 44
46-
if [[ "${VERSION}" -ge 43 && -f /etc/fedora-release ]]; then
45+
# after F44 launches, bump to 45
46+
if [[ "${VERSION}" -ge 44 && -f /etc/fedora-release ]]; then
4747
# pre-release rpmfusion is in a different location
4848
sed -i "s%free/fedora/releases%free/fedora/development%" /etc/yum.repos.d/rpmfusion-*.repo
4949
# pre-release rpmfusion needs to enable testing

‎build_files/test/test-prep.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ else
5858
fedora-repos-archive
5959
)
6060

61-
# after F43 launches, bump to 44
62-
if [[ "${RELEASE}" -ge 43 ]]; then
61+
# after F44 launches, bump to 45
62+
if [[ "${RELEASE}" -ge 44 ]]; then
6363
COPR_RELEASE="rawhide"
6464
else
6565
COPR_RELEASE="${RELEASE}"
@@ -78,8 +78,8 @@ else
7878
"https://negativo17.org/repos/fedora-multimedia.repo"
7979
fi
8080

81-
# after F43 launches, bump to 44
82-
if [[ "${RELEASE}" -ge 43 && -f /etc/fedora-release ]]; then
81+
# after F44 launches, bump to 45
82+
if [[ "${RELEASE}" -ge 44 && -f /etc/fedora-release ]]; then
8383
# pre-release rpmfusion is in a different location
8484
sed -i "s%free/fedora/releases%free/fedora/development%" /etc/yum.repos.d/rpmfusion-*.repo
8585
# pre-release rpmfusion needs to enable testing

‎images.yaml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
defaults:
33
kernel_flavor: main
4-
version: 42
4+
version: 43
55
akmods_target: common
66

77
arch-arm-x86: &arch-arm-x86
@@ -108,9 +108,6 @@ images:
108108
centos:
109109
!!merge <<:
110110
- *server-build-group-arm-x86
111-
centos-kmodsig:
112-
!!merge <<:
113-
- *server-build-group-arm-x86
114111
42:
115112
main:
116113
!!merge <<:
@@ -119,15 +116,14 @@ images:
119116
!!merge <<:
120117
- *desktop-build-group-arm-x86
121118
- *server-build-group-arm-x86
122-
"longterm-6.12":
123-
!!merge <<:
124-
- *desktop-build-group-arm-x86
125-
- *server-build-group-arm-x86
126-
127119
43:
128120
main:
129121
!!merge <<:
130122
- *desktop-build-group
123+
coreos-stable:
124+
!!merge <<:
125+
- *desktop-build-group-arm-x86
126+
- *server-build-group-arm-x86
131127
coreos-testing:
132128
!!merge <<:
133129
- *desktop-build-group-arm-x86

0 commit comments

Comments
 (0)