From cba7a577e248170f714bc4a416e891314a4367fa Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Wed, 24 Apr 2024 10:01:20 -0500 Subject: [PATCH 1/2] Apply patch for kernel 6.8 From GitHub [Pull Request #26][0]. Fixes compiling the driver on Kernel 6.8 (Fedora 39 and 40). [0]: https://github.com/google/gasket-driver/pull/26 --- Containerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index aaf9d60..b75c1c1 100644 --- a/Containerfile +++ b/Containerfile @@ -22,7 +22,8 @@ RUN install -o 101 -g 101 -d /usr/src/gasket-driver USER 101:101 # Build the gasket kernel module -RUN git clone https://github.com/google/gasket-driver.git /usr/src/gasket-driver +RUN git clone https://github.com/robertzaage/gasket-driver.git /usr/src/gasket-driver +RUN git -C /usr/src/gasket-driver checkout 2b0e08974e486002a70616f3c272ffb2203e044b RUN make \ -C /usr/src/kernels/$(rpm -q --qf %{V}-%{R}.%{ARCH} kernel-devel) \ M=/usr/src/gasket-driver/src \ -- 2.51.0 From 57e8097323f706165bb24dd901c233e8e1fa17dc Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Wed, 24 Apr 2024 10:16:17 -0500 Subject: [PATCH 2/2] ci: Add FCOS stream parameter Most of the time, we want to build the module for the latest version in the *testing* stream, so that it will be ready when that version moves to *stable*. There may be cases, though, where we need to build for a different stream. For example, if the module never built successfully by the time a version moved from *testing* to *stable*, we may need to manually build it for the current *stable*. --- Jenkinsfile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 362ea76..d47ae19 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,14 +1,21 @@ // vim: set sw=4 ts=4 sts=4 et : properties([ - pipelineTriggers([cron('H H * * *')]) + pipelineTriggers([cron('H H * * *')]), + parameters([ + choice( + choices: ['testing', 'stable', 'next'], + description: 'Fedora CoreOS Stream', + name: 'stream', + ) + ]), ]) import groovy.json.JsonSlurper def get_fcos_release(arch) { def res = httpRequest( - url: 'https://builds.coreos.fedoraproject.org/streams/testing.json', + url: "https://builds.coreos.fedoraproject.org/streams/${params.stream}.json", acceptType: 'APPLICATION_JSON', ) def json = new JsonSlurper() @@ -18,7 +25,7 @@ def get_fcos_release(arch) { def get_kernel_version(arch, fcos_release) { def res = httpRequest( - url: "https://builds.coreos.fedoraproject.org/prod/streams/testing/builds/${fcos_release}/${arch}/commitmeta.json", + url: "https://builds.coreos.fedoraproject.org/prod/streams/${params.stream}/builds/${fcos_release}/${arch}/commitmeta.json", acceptType: 'APPLICATION_JSON', ) def json = new JsonSlurper() -- 2.51.0