Skip to content

Commit 254dbeb

Browse files
authored
Merge pull request #72146 from rohennes/OCPBUGS-25695
OCPBUGS-25695: gingko timeout update
2 parents 034d76f + 8875e10 commit 254dbeb

7 files changed

+16
-9
lines changed

modules/cnf-measuring-latency.adoc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ oslat:: Behaves similarly to a CPU-intensive DPDK application and measures all t
2323
The tests introduce the following environment variables:
2424

2525
.Latency test environment variables
26-
[cols="1,3", options="header"]
26+
[cols="1,3a", options="header"]
2727
|====
2828
|Environment variables
2929
|Description
@@ -37,6 +37,11 @@ The tests introduce the following environment variables:
3737
|`LATENCY_TEST_RUNTIME`
3838
|Specifies the amount of time in seconds that the latency test must run. The default value is 300 seconds.
3939

40+
[NOTE]
41+
====
42+
To prevent the Ginkgo 2.0 test suite from timing out before the latency tests complete, set the `-ginkgo.timeout` flag to a value greater than `LATENCY_TEST_RUNTIME` + 2 minutes. If you also set a `LATENCY_TEST_DELAY` value then you must set `-ginkgo.timeout` to a value greater than `LATENCY_TEST_RUNTIME` + `LATENCY_TEST_DELAY` + 2 minutes. The default timeout value for the Ginkgo 2.0 test suite is 1 hour.
43+
====
44+
4045
|`HWLATDETECT_MAXIMUM_LATENCY`
4146
|Specifies the maximum acceptable hardware latency in microseconds for the workload and operating system. If you do not set the value of `HWLATDETECT_MAXIMUM_LATENCY` or `MAXIMUM_LATENCY`, the tool compares the default expected threshold (20μs) and the actual maximum latency in the tool itself. Then, the test fails or succeeds accordingly.
4247

modules/cnf-performing-end-to-end-tests-disconnected-mode.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
4141
-e IMAGE_REGISTRY="<disconnected_registry>" \
4242
-e CNF_TESTS_IMAGE="cnf-tests-rhel8:v{product-version}" \
4343
-e LATENCY_TEST_RUNTIME=<time_in_seconds> \
44-
<disconnected_registry>/cnf-tests-rhel8:v{product-version} /usr/bin/test-run.sh --ginkgo.v
44+
<disconnected_registry>/cnf-tests-rhel8:v{product-version} /usr/bin/test-run.sh --ginkgo.v --ginkgo.timeout="24h"
4545
----
4646

4747
[discrete]
@@ -58,7 +58,7 @@ $ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
5858
-e IMAGE_REGISTRY="<custom_image_registry>" \
5959
-e CNF_TESTS_IMAGE="<custom_cnf-tests_image>" \
6060
-e LATENCY_TEST_RUNTIME=<time_in_seconds> \
61-
registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} /usr/bin/test-run.sh --ginkgo.v
61+
registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} /usr/bin/test-run.sh --ginkgo.v --ginkgo.timeout="24h"
6262
----
6363
+
6464
where:
@@ -144,7 +144,7 @@ registry.redhat.io/openshift4/cnf-tests-rhel8:{product-version} \
144144
----
145145
$ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
146146
-e LATENCY_TEST_RUNTIME=<time_in_seconds> \
147-
-e IMAGE_REGISTRY=image-registry.openshift-image-registry.svc:5000/cnftests cnf-tests-local:latest /usr/bin/test-run.sh --ginkgo.v
147+
-e IMAGE_REGISTRY=image-registry.openshift-image-registry.svc:5000/cnftests cnf-tests-local:latest /usr/bin/test-run.sh --ginkgo.v --ginkgo.timeout="24h"
148148
----
149149

150150
[discrete]

modules/cnf-performing-end-to-end-tests-running-cyclictest.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ When executing `podman` commands as a non-root or non-privileged user, mounting
3030
$ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
3131
-e LATENCY_TEST_CPUS=10 -e LATENCY_TEST_RUNTIME=600 -e MAXIMUM_LATENCY=20 \
3232
registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} \
33-
/usr/bin/test-run.sh --ginkgo.focus="cyclictest" --ginkgo.v
33+
/usr/bin/test-run.sh --ginkgo.focus="cyclictest" --ginkgo.v --ginkgo.timeout="24h"
3434
----
3535
+
3636
The command runs the `cyclictest` tool for 10 minutes (600 seconds). The test runs successfully when the maximum observed latency is lower than `MAXIMUM_LATENCY` (in this example, 20 μs). Latency spikes of 20 μs and above are generally not acceptable for {rds} workloads.

modules/cnf-performing-end-to-end-tests-running-hwlatdetect.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ When executing `podman` commands as a non-root or non-privileged user, mounting
2828
$ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
2929
-e LATENCY_TEST_RUNTIME=600 -e MAXIMUM_LATENCY=20 \
3030
registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} \
31-
/usr/bin/test-run.sh --ginkgo.focus="hwlatdetect" --ginkgo.v
31+
/usr/bin/test-run.sh --ginkgo.focus="hwlatdetect" --ginkgo.v --ginkgo.timeout="24h"
3232
----
3333
+
3434
The `hwlatdetect` test runs for 10 minutes (600 seconds). The test runs successfully when the maximum observed latency is lower than `MAXIMUM_LATENCY` (20 μs).

modules/cnf-performing-end-to-end-tests-running-in-single-node-cluster.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ When executing `podman` commands as a non-root or non-privileged user, mounting
2929
----
3030
$ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
3131
-e LATENCY_TEST_RUNTIME=<time_in_seconds> registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} \
32-
/usr/bin/test-run.sh --ginkgo.v
32+
/usr/bin/test-run.sh --ginkgo.v --ginkgo.timeout="24h"
3333
----
3434
+
3535
[NOTE]

modules/cnf-performing-end-to-end-tests-running-oslat.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ When executing `podman` commands as a non-root or non-privileged user, mounting
2727
$ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
2828
-e LATENCY_TEST_CPUS=10 -e LATENCY_TEST_RUNTIME=600 -e MAXIMUM_LATENCY=20 \
2929
registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} \
30-
/usr/bin/test-run.sh --ginkgo.focus="oslat" --ginkgo.v
30+
/usr/bin/test-run.sh --ginkgo.focus="oslat" --ginkgo.v --ginkgo.timeout="24h"
3131
----
3232
+
3333
`LATENCY_TEST_CPUS` specifies the number of CPUs to test with the `oslat` command.

modules/cnf-performing-end-to-end-tests-running-the-tests.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,14 @@ $ podman run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig \
2727
-e LATENCY_TEST_RUNTIME=<time_in_seconds>\
2828
-e MAXIMUM_LATENCY=<time_in_microseconds> \
2929
registry.redhat.io/openshift4/cnf-tests-rhel8:v{product-version} /usr/bin/test-run.sh \
30-
--ginkgo.v
30+
--ginkgo.v --ginkgo.timeout="24h"
3131
----
3232

3333
. Optional: Append `--ginkgo.dryRun` flag to run the latency tests in dry-run mode. This is useful for checking what commands the tests run.
3434

3535
. Optional: Append `--ginkgo.v` flag to run the tests with increased verbosity.
36+
37+
. Optional: Append `--ginkgo.timeout="24h"` flag to ensure the Ginkgo 2.0 test suite does not timeout before the latency tests complete.
3638
+
3739
[IMPORTANT]
3840
====

0 commit comments

Comments
 (0)