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

rhel8: also build RHEL 8.10 images #741

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
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
14 changes: 13 additions & 1 deletion .github/workflows/buildx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
name: kernel versions
with:
script: |
var all_kernels = ['4.19', '5.4', '5.10', '5.15', '6.1', '6.6', 'bpf', 'bpf-net', 'bpf-next', 'rhel8.6', 'rhel8.9' ]
var all_kernels = ['4.19', '5.4', '5.10', '5.15', '6.1', '6.6', 'bpf', 'bpf-net', 'bpf-next', 'rhel8.6', 'rhel8.9', 'rhel8.10' ]
var kernels = []
const kernel_label_prefix = 'gha-builds/kernel/'
res = await github.rest.issues.listLabelsOnIssue({
Expand Down Expand Up @@ -85,15 +85,24 @@ jobs:
case 'rhel8.6':
options.dockerfile = "dockerfiles/kernel-images-rhel8"
options.platforms = 'linux/amd64'
options.rhel_repo = 'vault'
options.rhel_ver = '8.6'
options.rhel_kver = '4.18.0-372.32.1.el8_6'
break
case 'rhel8.9':
options.dockerfile = "dockerfiles/kernel-images-rhel8"
options.platforms = 'linux/amd64'
options.rhel_repo = 'vault'
options.rhel_ver = '8.9'
options.rhel_kver = '4.18.0-513.24.1.el8_9'
break
case 'rhel8.10':
options.dockerfile = "dockerfiles/kernel-images-rhel8"
options.platforms = 'linux/amd64'
options.rhel_repo = 'pub'
options.rhel_ver = '8.10'
options.rhel_kver = '4.18.0-553.22.1.el8_10'
break
default:
options.dockerfile = "dockerfiles/kernel-images"
options.platforms = 'linux/amd64,linux/arm64'
Expand Down Expand Up @@ -140,6 +149,7 @@ jobs:
build-tag: quay.io/lvh-images/kernel-images-ci:${{ matrix.kernel.ver }}-${{ needs.conf.outputs.tag }}
build-args: |
"KERNEL_VER=${{ matrix.kernel.ver }}"
"RHEL_REPO=${{ matrix.kernel.rhel_repo }}"
"RHEL_VER=${{ matrix.kernel.rhel_ver }}"
"RHEL_KVER=${{ matrix.kernel.rhel_kver }}"
check-files: '.'
Expand Down Expand Up @@ -212,6 +222,8 @@ jobs:
kernel: {ver: "rhel8.6"}
- runner: {name: "ubuntu-22.04-arm64", arch: "arm64"}
kernel: {ver: "rhel8.9"}
- runner: {name: "ubuntu-22.04-arm64", arch: "arm64"}
kernel: {ver: "rhel8.10"}
uses: ./.github/workflows/buildx-stage.yaml
secrets: inherit
with:
Expand Down
4 changes: 3 additions & 1 deletion _data/kernels.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@
[ "--disable", "CONFIG_MODULE_SIG_ALL"],
[ "--disable", "CONFIG_IPV6_SEG6_LWTUNNEL" ],
[ "--enable", "CONFIG_RANDOMIZE_BASE" ],
[ "--enable", "CONFIG_RELOCATABLE" ]
[ "--enable", "CONFIG_RELOCATABLE" ],
[ "--enable", "CONFIG_X86_64" ],
[ "--disable", "CONFIG_EFI_MIXED" ]
]
}
],
Expand Down
3 changes: 2 additions & 1 deletion dockerfiles/kernel-images-rhel8
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ RUN dnf config-manager --set-enabled powertools

FROM builder AS prepare

ARG RHEL_REPO=vault
ARG RHEL_VER=8.6
ARG RHEL_KVER=4.18.0-372.32.1.el8_6

WORKDIR /tmp
RUN curl -LO "https://dl.rockylinux.org/vault/rocky/${RHEL_VER}/BaseOS/source/tree/Packages/k/kernel-${RHEL_KVER}.src.rpm"
RUN curl -LO "https://dl.rockylinux.org/${RHEL_REPO}/rocky/${RHEL_VER}/BaseOS/source/tree/Packages/k/kernel-${RHEL_KVER}.src.rpm"
RUN rpm -ivh kernel*.src.rpm

WORKDIR /root/rpmbuild/SPECS
Expand Down
Loading