From fe46b62e083493b1204b75a2adf92c5c7c4cea37 Mon Sep 17 00:00:00 2001 From: Thomas-David Griedel Date: Tue, 7 Jan 2025 19:12:26 +0100 Subject: [PATCH] Add filter label parameter for functional tests (#3566) * add parameter Signed-off-by: Thomas-David Griedel * make it explicit again Signed-off-by: Thomas-David Griedel griedel911@gmail.com --------- Signed-off-by: Thomas-David Griedel Signed-off-by: Thomas-David Griedel griedel911@gmail.com --- hack/build/run-functional-tests.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hack/build/run-functional-tests.sh b/hack/build/run-functional-tests.sh index ae1de6d794..b8df92e9f1 100755 --- a/hack/build/run-functional-tests.sh +++ b/hack/build/run-functional-tests.sh @@ -97,12 +97,12 @@ fi export TESTS_WORKDIR=${CDI_DIR}/tests ginkgo_args="--trace --timeout=8h --v" - if [[ -n "$CDI_E2E_SKIP" ]]; then - ginkgo_args="${ginkgo_args} --skip=${CDI_E2E_SKIP}" + if [[ -n "$CDI_LABEL_FILTER" ]]; then + ginkgo_args="${ginkgo_args} --label-filter=${CDI_LABEL_FILTER}" fi - if [[ -n "$CDI_E2E_FOCUS" || -n "$CDI_E2E_SKIP" ]]; then - ginkgo_args="${ginkgo_args} --nodes=6" + if [[ -n "$CDI_E2E_SKIP" ]]; then + ginkgo_args="${ginkgo_args} --skip=${CDI_E2E_SKIP}" fi if [[ "$CDI_E2E_FOCUS" =~ /.+\.go/ ]]; then @@ -110,6 +110,10 @@ fi elif [[ -n "$CDI_E2E_FOCUS" ]]; then ginkgo_args="${ginkgo_args} --focus=${CDI_E2E_FOCUS}" fi - + + if [[ -n "$CDI_E2E_FOCUS" || -n "$CDI_E2E_SKIP" ]]; then + ginkgo_args="${ginkgo_args} --nodes=6" + fi + ${TESTS_OUT_DIR}/ginkgo ${ginkgo_args} ${TESTS_OUT_DIR}/tests.test -- ${test_args} ) \ No newline at end of file