Merge pull request #96109 from openshift-cherrypick-robot/cherry-pick-95329-to-enterprise-4.19

bscott-rh · web-flow · commit 6cd6a161baa1 · 2025-07-15T11:13:54.000-04:00
[enterprise-4.19] OCPBUGS-56241#Update RHEL 8 to RHEL 9 in the cnf-tests image URL
diff --git a/modules/cnf-performing-end-to-end-tests-disconnected-mode.adoc b/modules/cnf-performing-end-to-end-tests-disconnected-mode.adoc
@@ -23,7 +23,7 @@ A `mirror` executable is shipped in the image to provide the input required by `
 [source,terminal,subs="attributes+"]
 ----
 $ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
-registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} \
+registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} \
 /usr/bin/mirror -registry <disconnected_registry> | oc image mirror -f -
 ----
 +
@@ -39,9 +39,9 @@ where:
 ----
 podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
 -e IMAGE_REGISTRY="<disconnected_registry>" \
--e CNF_TESTS_IMAGE="cnf-tests-rhel8:v{product-version}" \
+-e CNF_TESTS_IMAGE="cnf-tests-rhel9:v{product-version}" \
 -e LATENCY_TEST_RUNTIME=<time_in_seconds> \
-<disconnected_registry>/cnf-tests-rhel8:v{product-version} /usr/bin/test-run.sh --ginkgo.v --ginkgo.timeout="24h"
+<disconnected_registry>/cnf-tests-rhel9:v{product-version} /usr/bin/test-run.sh --ginkgo.v --ginkgo.timeout="24h"
 ----
 
 [discrete]
@@ -58,7 +58,7 @@ $ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
 -e IMAGE_REGISTRY="<custom_image_registry>" \
 -e CNF_TESTS_IMAGE="<custom_cnf-tests_image>" \
 -e LATENCY_TEST_RUNTIME=<time_in_seconds> \
-registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} /usr/bin/test-run.sh --ginkgo.v --ginkgo.timeout="24h"
+registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} /usr/bin/test-run.sh --ginkgo.v --ginkgo.timeout="24h"
 ----
 +
 where:
@@ -133,7 +133,7 @@ $ echo "{\"auths\": { \"$REGISTRY\": { \"auth\": $TOKEN } }}" > dockerauth.json
 [source,terminal,subs="attributes+"]
 ----
 $ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
-registry.redhat.io/openshift4/cnf-tests-rhel8:{product-version} \
+registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} \
 /usr/bin/mirror -registry $REGISTRY/cnftests |  oc image mirror --insecure=true \
 -a=$(pwd)/dockerauth.json -f -
 ----
@@ -173,7 +173,7 @@ You can optionally change the default upstream images that are mirrored for the
 [source,terminal,subs="attributes+"]
 ----
 $ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
-registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} /usr/bin/mirror \
+registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} /usr/bin/mirror \
 --registry "my.local.registry:5000/" --images "/kubeconfig/images.json" \
 |  oc image mirror -f -
 ----
diff --git a/modules/cnf-performing-end-to-end-tests-junit-test-output.adoc b/modules/cnf-performing-end-to-end-tests-junit-test-output.adoc
@@ -26,7 +26,7 @@ You must create the `junit` folder before running this command.
 [source,terminal,subs="attributes+"]
 ----
 $ podman run -v $(pwd)/:/kubeconfig:Z -v $(pwd)/junit:/junit \
--e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} \
+-e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} \
 /usr/bin/test-run.sh --ginkgo.junit-report junit/<file-name>.xml --ginkgo.v
 ----
 +
diff --git a/modules/cnf-performing-end-to-end-tests-running-cyclictest.adoc b/modules/cnf-performing-end-to-end-tests-running-cyclictest.adoc
@@ -25,7 +25,7 @@ When executing `podman` commands as a non-root or non-privileged user, mounting
 ----
 $ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
 -e LATENCY_TEST_CPUS=10 -e LATENCY_TEST_RUNTIME=600 -e MAXIMUM_LATENCY=20 \
-registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} \
+registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} \
 /usr/bin/test-run.sh --ginkgo.focus="cyclictest" --ginkgo.v --ginkgo.timeout="24h"
 ----
 +
diff --git a/modules/cnf-performing-end-to-end-tests-running-hwlatdetect.adoc b/modules/cnf-performing-end-to-end-tests-running-hwlatdetect.adoc
@@ -25,7 +25,7 @@ When executing `podman` commands as a non-root or non-privileged user, mounting
 ----
 $ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
 -e LATENCY_TEST_RUNTIME=600 -e MAXIMUM_LATENCY=20 \
-registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} \
+registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} \
 /usr/bin/test-run.sh --ginkgo.focus="hwlatdetect" --ginkgo.v --ginkgo.timeout="24h"
 ----
 +
diff --git a/modules/cnf-performing-end-to-end-tests-running-in-single-node-cluster.adoc b/modules/cnf-performing-end-to-end-tests-running-in-single-node-cluster.adoc
@@ -28,7 +28,7 @@ When executing `podman` commands as a non-root or non-privileged user, mounting
 [source,terminal,subs="attributes+"]
 ----
 $ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
--e LATENCY_TEST_RUNTIME=<time_in_seconds> registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} \
+-e LATENCY_TEST_RUNTIME=<time_in_seconds> registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} \
 /usr/bin/test-run.sh --ginkgo.v --ginkgo.timeout="24h"
 ----
 +
diff --git a/modules/cnf-performing-end-to-end-tests-running-oslat.adoc b/modules/cnf-performing-end-to-end-tests-running-oslat.adoc
@@ -25,7 +25,7 @@ When executing `podman` commands as a non-root or non-privileged user, mounting
 ----
 $ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
 -e LATENCY_TEST_CPUS=10 -e LATENCY_TEST_RUNTIME=600 -e MAXIMUM_LATENCY=20 \
-registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} \
+registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} \
 /usr/bin/test-run.sh --ginkgo.focus="oslat" --ginkgo.v --ginkgo.timeout="24h"
 ----
 +
diff --git a/modules/cnf-performing-end-to-end-tests-running-the-tests.adoc b/modules/cnf-performing-end-to-end-tests-running-the-tests.adoc
@@ -33,7 +33,7 @@ In the following command, your local `kubeconfig` is mounted to kubeconfig/kubec
 $ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
 -e LATENCY_TEST_RUNTIME=600\
 -e MAXIMUM_LATENCY=20 \
-registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} /usr/bin/test-run.sh \
+registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} /usr/bin/test-run.sh \
 --ginkgo.v --ginkgo.timeout="24h"
 ----
 +
diff --git a/modules/cnf-performing-end-to-end-tests-test-failure-report.adoc b/modules/cnf-performing-end-to-end-tests-test-failure-report.adoc
@@ -21,7 +21,7 @@ Use the following procedures to generate a JUnit latency test output and test fa
 [source,terminal,subs="attributes+"]
 ----
 $ podman run -v $(pwd)/:/kubeconfig:Z -v $(pwd)/reportdest:<report_folder_path> \
--e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} \
+-e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} \
 /usr/bin/test-run.sh --report <report_folder_path> --ginkgo.v
 ----
 +
diff --git a/modules/cnf-performing-end-to-end-tests-troubleshooting.adoc b/modules/cnf-performing-end-to-end-tests-troubleshooting.adoc
@@ -21,7 +21,7 @@ To run latency tests, the cluster must be accessible from within the `cnf-tests`
 [source,terminal,subs="attributes+"]
 ----
 $ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
-registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} \
+registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} \
 oc get nodes
 ----
 +
diff --git a/scalability_and_performance/cnf-performing-platform-verification-latency-tests.adoc b/scalability_and_performance/cnf-performing-platform-verification-latency-tests.adoc
@@ -8,7 +8,7 @@ toc::[]
 
 You can use the Cloud-native Network Functions (CNF) tests image to run latency tests on a CNF-enabled {product-title} cluster, where all the components required for running CNF workloads are installed. Run the latency tests to validate node tuning for your workload.
 
-The `cnf-tests` container image is available at `registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version}`.
+The `cnf-tests` container image is available at `registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version}`.
 
 [id="cnf-latency-tests-prerequisites_{context}"]
 == Prerequisites for running latency tests

Original file line number	Diff line number	Diff line change
@@ -26,7 +26,7 @@ You must create the `junit` folder before running this command.
`26`	`26`	`[source,terminal,subs="attributes+"]`
`27`	`27`	`----`
`28`	`28`	`$ podman run -v $(pwd)/:/kubeconfig:Z -v $(pwd)/junit:/junit \`
`29`		`--e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} \`
	`29`	`+-e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} \`
`30`	`30`	`/usr/bin/test-run.sh --ginkgo.junit-report junit/<file-name>.xml --ginkgo.v`
`31`	`31`	`----`
`32`	`32`	`+`
Original file line number	Diff line number	Diff line change
@@ -25,7 +25,7 @@ When executing `podman` commands as a non-root or non-privileged user, mounting
`25`	`25`	`----`
`26`	`26`	`$ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \`
`27`	`27`	`-e LATENCY_TEST_CPUS=10 -e LATENCY_TEST_RUNTIME=600 -e MAXIMUM_LATENCY=20 \`
`28`		`-registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} \`
	`28`	`+registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} \`
`29`	`29`	`/usr/bin/test-run.sh --ginkgo.focus="cyclictest" --ginkgo.v --ginkgo.timeout="24h"`
`30`	`30`	`----`
`31`	`31`	`+`
Original file line number	Diff line number	Diff line change
@@ -28,7 +28,7 @@ When executing `podman` commands as a non-root or non-privileged user, mounting
`28`	`28`	`[source,terminal,subs="attributes+"]`
`29`	`29`	`----`
`30`	`30`	`$ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \`
`31`		`--e LATENCY_TEST_RUNTIME=<time_in_seconds> registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} \`
	`31`	`+-e LATENCY_TEST_RUNTIME=<time_in_seconds> registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} \`
`32`	`32`	`/usr/bin/test-run.sh --ginkgo.v --ginkgo.timeout="24h"`
`33`	`33`	`----`
`34`	`34`	`+`
Original file line number	Diff line number	Diff line change
@@ -33,7 +33,7 @@ In the following command, your local `kubeconfig` is mounted to kubeconfig/kubec
`33`	`33`	`$ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \`
`34`	`34`	`-e LATENCY_TEST_RUNTIME=600\`
`35`	`35`	`-e MAXIMUM_LATENCY=20 \`
`36`		`-registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} /usr/bin/test-run.sh \`
	`36`	`+registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} /usr/bin/test-run.sh \`
`37`	`37`	`--ginkgo.v --ginkgo.timeout="24h"`
`38`	`38`	`----`
`39`	`39`	`+`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ Use the following procedures to generate a JUnit latency test output and test fa`
`21`	`21`	`[source,terminal,subs="attributes+"]`
`22`	`22`	`----`
`23`	`23`	`$ podman run -v $(pwd)/:/kubeconfig:Z -v $(pwd)/reportdest:<report_folder_path> \`
`24`		`--e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} \`
	`24`	`+-e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} \`
`25`	`25`	`/usr/bin/test-run.sh --report <report_folder_path> --ginkgo.v`
`26`	`26`	`----`
`27`	`27`	`+`
Original file line number	Diff line number	Diff line change
@@ -21,7 +21,7 @@ To run latency tests, the cluster must be accessible from within the `cnf-tests`
`21`	`21`	`[source,terminal,subs="attributes+"]`
`22`	`22`	`----`
`23`	`23`	`$ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \`
`24`		`-registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} \`
	`24`	`+registry.redhat.io/openshift4/cnf-tests-rhel9:v{product-version} \`
`25`	`25`	`oc get nodes`
`26`	`26`	`----`
`27`	`27`	`+`