From 2e66b8562b11bc23f8dd5980d5b282cef2812d41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20St=C3=A4bler?= Date: Wed, 20 Apr 2022 17:03:22 +0200 Subject: [PATCH] UPSTREAM: : Rerun flaky e2e tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christoph Stäbler (cherry picked from commit 4857be07d4dc7f67be8edea703e759464aaf2fa2) (cherry picked from commit 22608ef275f3562f7cbcc600e9cfe439b1802a35) (cherry picked from commit c8fa90dc40c276eb8bd5162682a0d745861c921d) (cherry picked from commit 51b4fdc303347f5f6577ef9857805f088b5be534) (cherry picked from commit 89d0f12b7332b0c1cb0fb5dfc1f4cd01a465e440) (cherry picked from commit 31111671380ddf4485e57c5aeea15bf364ccc67e) Signed-off-by: Douglas Schilling Landgraf (cherry picked from commit c3087638c03a6d6d70059311e3c79266e8081b66) Signed-off-by: Douglas Schilling Landgraf (cherry picked from commit 23b48e44df936edca09dffbb2d62ffea3d20088e) Signed-off-by: Douglas Schilling Landgraf --- hack/ocp-e2e-tests-handler.sh | 3 ++- hack/ocp-e2e-tests-operator.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hack/ocp-e2e-tests-handler.sh b/hack/ocp-e2e-tests-handler.sh index 79ba31aea..8f7c7233b 100755 --- a/hack/ocp-e2e-tests-handler.sh +++ b/hack/ocp-e2e-tests-handler.sh @@ -17,6 +17,7 @@ export KUBEVIRTCI_RUNTIME="${KUBEVIRTCI_RUNTIME:-podman}" export PRIMARY_NIC=enp2s0 export FIRST_SECONDARY_NIC=enp3s0 export SECOND_SECONDARY_NIC=enp4s0 +export FLAKE_ATTEMPTS="${FLAKE_ATTEMPTS:-5}" SKIPPED_TESTS="user-guide|bridged" @@ -56,4 +57,4 @@ while ! oc get pods -n nmstate | grep handler; do sleep 1; done # Then wait for them to be ready while oc get pods -n nmstate | grep "0/1"; do sleep 1; done # NOTE(bnemec): The test being filtered with "bridged" was re-enabled in 4.8, but seems to be consistently failing on OCP. -make test-e2e-handler E2E_TEST_ARGS="--skip=\"${SKIPPED_TESTS}\"" E2E_TEST_TIMEOUT=120h +make test-e2e-handler E2E_TEST_ARGS="--skip=\"${SKIPPED_TESTS}\" --flakeAttempts=${FLAKE_ATTEMPTS}" E2E_TEST_TIMEOUT=120h diff --git a/hack/ocp-e2e-tests-operator.sh b/hack/ocp-e2e-tests-operator.sh index faeaa3900..cb07a6cbe 100755 --- a/hack/ocp-e2e-tests-operator.sh +++ b/hack/ocp-e2e-tests-operator.sh @@ -14,6 +14,7 @@ export KUBEVIRT_PROVIDER=external export IMAGE_BUILDER="${IMAGE_BUILDER:-podman}" export DEV_IMAGE_REGISTRY="${DEV_IMAGE_REGISTRY:-quay.io}" export KUBEVIRTCI_RUNTIME="${KUBEVIRTCI_RUNTIME:-podman}" +export FLAKE_ATTEMPTS="${FLAKE_ATTEMPTS:-5}" make cluster-sync-operator -make test-e2e-operator +make test-e2e-operator E2E_TEST_ARGS="--flakeAttempts=${FLAKE_ATTEMPTS}"