Skip to content

Commit 91d22be

Browse files
authored
Fix hack/test-tuned-fdp.sh (#1285)
When testing new TuneD releases, we use the official Dockerfile.rhel9. The official Containerfile uses registry.ci.openshift.org/ocp/<OCP-VERSION>:base-rhel<RHEL-VERSION> images. These images use a wrapper for dnf/yum commands. The purpose of that wrapper to wrap yum/dnf invocations that are issued by CI workloads or local docker builds of OCP components. While the wrapper is useful to build an image identical or close to identical to the actual ART releases, it will ignore any custom repositories supplied to it via the "podman build" process and volume mounting /etc/yum.repos.d. The behaviour of the wrapper dnf/yum script can be modified by supplying it ART_DNF_WRAPPER_POLICY variable. Setting the value "append" to this variable does exactly what we need -- do not remove base image .repo files from dnf runs - only add ART repos based on invocation context. Co-authored-by: Jiri Mencak <[email protected]>
1 parent eb1cee9 commit 91d22be

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

hack/test-tuned-fdp.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ EOF
6161

6262
deploy_custom_nto() {
6363
# Prepare Makefile and deploy-custom-nto.sh variables
64-
export IMAGE_BUILD_EXTRA_OPTS="-v=$REPO_DIR:/etc/yum.repos.d:z"
64+
export IMAGE_BUILD_EXTRA_OPTS="-v=$REPO_DIR:/etc/yum.repos.d:z --env=ART_DNF_WRAPPER_POLICY=append"
6565
export DOCKERFILE=Dockerfile.rhel9 # Do not build TuneD from source, use pre-built TuneD RPMs. These RPMs might contain extra patches which do not ship ustream.
6666
export ORG
6767

0 commit comments

Comments
 (0)