From 2870625f5f4ffae9db8176a7ff429a43f80b3b0b Mon Sep 17 00:00:00 2001 From: Balendu Mouli Burla Date: Wed, 14 May 2025 09:21:28 -0500 Subject: [PATCH] BUG 2110176 Update pciutils version - Verified the sriov-fec-operator docker build. - Functional sanity testing performed. Closes-Bug: 2110176 Change-Id: I8b604f2227b697374bc5f0bf049ffe9881195361 Signed-off-by: Balendu Mouli Burla --- .../sriov-fec-daemon.stable_docker_image | 2 +- .../sriov-fec-labeler.stable_docker_image | 2 +- .../sriov-fec-operator.stable_docker_image | 2 +- ...-SCSY-211052-Update-pciutils-version.patch | 29 +++++++++++++++++++ 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 sriov-fec-operator-images/files/0003-SCSY-211052-Update-pciutils-version.patch diff --git a/sriov-fec-operator-images/debian/sriov-fec-daemon.stable_docker_image b/sriov-fec-operator-images/debian/sriov-fec-daemon.stable_docker_image index e1fc235..4d1c7bc 100644 --- a/sriov-fec-operator-images/debian/sriov-fec-daemon.stable_docker_image +++ b/sriov-fec-operator-images/debian/sriov-fec-daemon.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=script LABEL=sriov-fec-daemon SOURCE_REPO=https://github.com/intel/sriov-fec-operator.git SOURCE_REF=0b655a922c155479884702b004c0e1a94c93db73 -SOURCE_PATCHES="../files/0001-Add-image-pull-secrets-for-stx-builds.patch ../files/0002-SCSY-210415-Fix-multiple-acc-config-issue.patch" +SOURCE_PATCHES="../files/0001-Add-image-pull-secrets-for-stx-builds.patch ../files/0002-SCSY-210415-Fix-multiple-acc-config-issue.patch ../files/0003-SCSY-211052-Update-pciutils-version.patch" COMMAND=bash SCRIPT=build-sriov-fec-operator-image.sh ARGS=daemon diff --git a/sriov-fec-operator-images/debian/sriov-fec-labeler.stable_docker_image b/sriov-fec-operator-images/debian/sriov-fec-labeler.stable_docker_image index 7bc2cf4..7deee55 100644 --- a/sriov-fec-operator-images/debian/sriov-fec-labeler.stable_docker_image +++ b/sriov-fec-operator-images/debian/sriov-fec-labeler.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=script LABEL=sriov-fec-labeler SOURCE_REPO=https://github.com/intel/sriov-fec-operator.git SOURCE_REF=0b655a922c155479884702b004c0e1a94c93db73 -SOURCE_PATCHES="../files/0001-Add-image-pull-secrets-for-stx-builds.patch ../files/0002-SCSY-210415-Fix-multiple-acc-config-issue.patch" +SOURCE_PATCHES="../files/0001-Add-image-pull-secrets-for-stx-builds.patch ../files/0002-SCSY-210415-Fix-multiple-acc-config-issue.patch ../files/0003-SCSY-211052-Update-pciutils-version.patch" COMMAND=bash SCRIPT=build-sriov-fec-operator-image.sh ARGS=labeler diff --git a/sriov-fec-operator-images/debian/sriov-fec-operator.stable_docker_image b/sriov-fec-operator-images/debian/sriov-fec-operator.stable_docker_image index 8c367b5..cf17b5e 100644 --- a/sriov-fec-operator-images/debian/sriov-fec-operator.stable_docker_image +++ b/sriov-fec-operator-images/debian/sriov-fec-operator.stable_docker_image @@ -2,7 +2,7 @@ BUILDER=script LABEL=sriov-fec-operator SOURCE_REPO=https://github.com/intel/sriov-fec-operator.git SOURCE_REF=0b655a922c155479884702b004c0e1a94c93db73 -SOURCE_PATCHES="../files/0001-Add-image-pull-secrets-for-stx-builds.patch ../files/0002-SCSY-210415-Fix-multiple-acc-config-issue.patch" +SOURCE_PATCHES="../files/0001-Add-image-pull-secrets-for-stx-builds.patch ../files/0002-SCSY-210415-Fix-multiple-acc-config-issue.patch ../files/0003-SCSY-211052-Update-pciutils-version.patch" COMMAND=bash SCRIPT=build-sriov-fec-operator-image.sh ARGS=operator diff --git a/sriov-fec-operator-images/files/0003-SCSY-211052-Update-pciutils-version.patch b/sriov-fec-operator-images/files/0003-SCSY-211052-Update-pciutils-version.patch new file mode 100644 index 0000000..6030409 --- /dev/null +++ b/sriov-fec-operator-images/files/0003-SCSY-211052-Update-pciutils-version.patch @@ -0,0 +1,29 @@ +From 102e782a776f722399f8732e1f8ee0cbc3f058f9 Mon Sep 17 00:00:00 2001 +From: Hernan Vargas +Date: Tue, 13 May 2025 09:14:00 -0700 +Subject: [PATCH] SCSY-211052 Update pciutils version + +ubi:9.5-1736404036 has again changed pciutils-3.7.0-5.el9_5.1 +to pciutils-3.7.0-7.el9.x86_64 in their repo. + +Signed-off-by: Hernan Vargas +--- + Dockerfile.daemon | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Dockerfile.daemon b/Dockerfile.daemon +index 3592ec9..8c832a4 100644 +--- a/Dockerfile.daemon ++++ b/Dockerfile.daemon +@@ -27,7 +27,7 @@ FROM registry.access.redhat.com/ubi9/ubi:9.5-1736404036 AS package_installer + + RUN yum install \ + kmod-28-10.el9 \ +- pciutils-3.7.0-5.el9 \ ++ pciutils-3.7.0-7.el9 \ + procps-ng-3.3.17-14.el9 \ + --releasever 9 --setopt install_weak_deps=false --nodocs -y && \ + yum clean all +-- +2.34.1 +