From 92a4e8129631ae7e38ae2aade05a6b0f66f690d4 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Tue, 25 Nov 2025 16:02:35 -0500
Subject: [PATCH] Test with base-rhel9-minimal-test

---
 Dockerfile.CNI.rhel                      | 2 +-
 Dockerfile.IntelNetSecVSP.rhel           | 2 +-
 Dockerfile.IntelP4.rhel                  | 2 +-
 Dockerfile.IntelVSP.rhel                 | 2 +-
 Dockerfile.daemon.rhel                   | 2 +-
 Dockerfile.mrvlCPAgent.rhel              | 2 +-
 Dockerfile.mrvlVSP.rhel                  | 2 +-
 Dockerfile.networkResourcesInjector.rhel | 2 +-
 Dockerfile.rhel                          | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile.CNI.rhel b/Dockerfile.CNI.rhel
index f597708f8..7fe876356 100644
--- a/Dockerfile.CNI.rhel
+++ b/Dockerfile.CNI.rhel
@@ -7,7 +7,7 @@ COPY . /usr/src/dpu-cni
 WORKDIR /usr/src/dpu-cni
 RUN go build -o dpucni ./dpu-cni/dpu-cni.go
 
-FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.21:base-rhel9-minimal-test
 COPY --from=builder /usr/src/dpu-cni/dpucni /usr/bin/
 WORKDIR /
 
diff --git a/Dockerfile.IntelNetSecVSP.rhel b/Dockerfile.IntelNetSecVSP.rhel
index 182bfeed1..1c121486b 100644
--- a/Dockerfile.IntelNetSecVSP.rhel
+++ b/Dockerfile.IntelNetSecVSP.rhel
@@ -17,7 +17,7 @@ RUN mkdir -p /bin && \
 
 # Use distroless as minimal base image to package the Marvell VSP binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.21:base-rhel9-minimal-test
 ARG TARGETARCH
 COPY --from=builder /workspace/bin/vsp-intel-netsec.${TARGETARCH} /vsp-intel-netsec
 
diff --git a/Dockerfile.IntelP4.rhel b/Dockerfile.IntelP4.rhel
index fa4d500ad..073d77c4c 100644
--- a/Dockerfile.IntelP4.rhel
+++ b/Dockerfile.IntelP4.rhel
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.21:base-rhel9-minimal-test
 
 ARG P4_NAME=fxp-net_linux-networking
 ENV P4_NAME $P4_NAME
diff --git a/Dockerfile.IntelVSP.rhel b/Dockerfile.IntelVSP.rhel
index 03d7d17b2..d7f74de08 100644
--- a/Dockerfile.IntelVSP.rhel
+++ b/Dockerfile.IntelVSP.rhel
@@ -9,7 +9,7 @@ COPY . .
 # As a temporary workaround, we can try specifying GOMAXPROCS=2 to relieve this issue
 RUN GOMAXPROCS=2 CGO_ENABLED=1 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} make build-intel-vsp
 
-FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.21:base-rhel9-minimal-test
 ARG TARGETARCH
 ENV PYTHONUNBUFFERED=1
 WORKDIR /
diff --git a/Dockerfile.daemon.rhel b/Dockerfile.daemon.rhel
index d996aff2e..cacbd8ded 100644
--- a/Dockerfile.daemon.rhel
+++ b/Dockerfile.daemon.rhel
@@ -18,7 +18,7 @@ RUN GOMAXPROCS=2 CGO_ENABLED=1 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} make
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.21:base-rhel9-minimal-test
 ARG TARGETARCH
 WORKDIR /
 COPY --from=builder /workspace/bin/daemon.${TARGETARCH} daemon
diff --git a/Dockerfile.mrvlCPAgent.rhel b/Dockerfile.mrvlCPAgent.rhel
index fde3a40f6..ad2240721 100644
--- a/Dockerfile.mrvlCPAgent.rhel
+++ b/Dockerfile.mrvlCPAgent.rhel
@@ -58,7 +58,7 @@ RUN GOMAXPROCS=2 CGO_ENABLED=1 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go b
 
 # Use distroless as minimal base image to package the Marvell CP agent binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.21:base-rhel9-minimal-test-minimal-test
 COPY --from=stage1 /cpagent-bin/ /usr/bin/
 
 RUN yum update -y \
diff --git a/Dockerfile.mrvlVSP.rhel b/Dockerfile.mrvlVSP.rhel
index c730f090c..fcab8e3e1 100644
--- a/Dockerfile.mrvlVSP.rhel
+++ b/Dockerfile.mrvlVSP.rhel
@@ -17,7 +17,7 @@ RUN mkdir -p /bin && \
 
 # Use distroless as minimal base image to package the Marvell VSP binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.21:base-rhel9-minimal-test
 ARG TARGETARCH
 COPY --from=builder /workspace/bin/vsp-mrvl.${TARGETARCH} /vsp-mrvl
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/Dockerfile.networkResourcesInjector.rhel b/Dockerfile.networkResourcesInjector.rhel
index fcb2c5f0d..7f2242054 100644
--- a/Dockerfile.networkResourcesInjector.rhel
+++ b/Dockerfile.networkResourcesInjector.rhel
@@ -5,7 +5,7 @@ WORKDIR /workspace
 COPY . .
 RUN GOMAXPROCS=2 CGO_ENABLED=1 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} make build-network-resources-injector
 
-FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.21:base-rhel9-minimal-test
 ARG TARGETARCH
 WORKDIR /
 
diff --git a/Dockerfile.rhel b/Dockerfile.rhel
index b32097b0a..3140aecde 100644
--- a/Dockerfile.rhel
+++ b/Dockerfile.rhel
@@ -18,7 +18,7 @@ RUN GOMAXPROCS=2 CGO_ENABLED=1 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} make
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.21:base-rhel9-minimal-test
 WORKDIR /
 ARG TARGETARCH
 COPY --from=builder /workspace/bin/manager.${TARGETARCH} manager