starlingx/app-sriov-fec-operator
Code Issues Proposed changes

Fix sriov-fec-daemon build failure

Browse Source 
Package kmod-28-9.el9 is noi longer available in
registry.access.redhat.com/ubi9/ubi:9.4-947.
It has been replaced by kmod-28-10.el9.

I propose to patch the upstream git to install
kmod-28-10.el9.

I can test build, but I don't know how to test the sriov
container in the runtime environment.  Is there a subject
matter expert that can test this, or propose an alternative fix?

Closes-Bug: 2088009
Change-Id: I6bac165da412cc52e02182f5484d3adc67fe3fb3
Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
Scott Little 2024-11-13 14:47:09 -05:00 committed by Ghada Khalil
parent 801b415dd2
commit b1a4499ec2
4 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sriov-fec-operator-images/debian/sriov-fec-daemon.stable_docker_image
View File

@ -2,7 +2,8 @@ BUILDER=script
LABEL=sriov-fec-daemon
SOURCE_REPO=https://github.com/intel/sriov-fec-operator.git
SOURCE_REF=471f355304105ecf7f558dd5dab7a7123064e4de
SOURCE_PATCHES="../files/0001-Add-image-pull-secrets-for-stx-builds.patch"
SOURCE_PATCHES="../files/0001-Add-image-pull-secrets-for-stx-builds.patch \
../files/0002-kmod-version-fix.patch"
COMMAND=bash
SCRIPT=build-sriov-fec-operator-image.sh
ARGS=daemon

3
sriov-fec-operator-images/debian/sriov-fec-labeler.stable_docker_image
View File

@ -2,7 +2,8 @@ BUILDER=script
LABEL=sriov-fec-labeler
SOURCE_REPO=https://github.com/intel/sriov-fec-operator.git
SOURCE_REF=471f355304105ecf7f558dd5dab7a7123064e4de
SOURCE_PATCHES="../files/0001-Add-image-pull-secrets-for-stx-builds.patch"
SOURCE_PATCHES="../files/0001-Add-image-pull-secrets-for-stx-builds.patch \
../files/0002-kmod-version-fix.patch"
COMMAND=bash
SCRIPT=build-sriov-fec-operator-image.sh
ARGS=labeler

3
sriov-fec-operator-images/debian/sriov-fec-operator.stable_docker_image
View File

@ -2,7 +2,8 @@ BUILDER=script
LABEL=sriov-fec-operator
SOURCE_REPO=https://github.com/intel/sriov-fec-operator.git
SOURCE_REF=471f355304105ecf7f558dd5dab7a7123064e4de
SOURCE_PATCHES="../files/0001-Add-image-pull-secrets-for-stx-builds.patch"
SOURCE_PATCHES="../files/0001-Add-image-pull-secrets-for-stx-builds.patch \
../files/0002-kmod-version-fix.patch"
COMMAND=bash
SCRIPT=build-sriov-fec-operator-image.sh
ARGS=operator

26
sriov-fec-operator-images/files/0002-kmod-version-fix.patch Normal file
View File

@ -0,0 +1,26 @@
From 6acc63bff58c9a2a571f88ab61157c4cfef55410 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Wed, 13 Nov 2024 14:35:36 -0500
Subject: [PATCH] kmod version fix
Signed-off-by: Scott Little <scott.little@windriver.com>
---
Dockerfile.daemon | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile.daemon b/Dockerfile.daemon
index facfa95..52ea883 100644
--- a/Dockerfile.daemon
+++ b/Dockerfile.daemon
@@ -26,7 +26,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o sriov_fe
FROM registry.access.redhat.com/ubi9/ubi:9.4-947 AS package_installer
RUN yum install \
- kmod-28-9.el9 \
+ kmod-28-10.el9 \
pciutils-3.7.0-5.el9 \
procps-ng-3.3.17-14.el9 \
--releasever 9 --setopt install_weak_deps=false --nodocs -y && \
--
2.25.1