allow to run flaky tests in PR (#42103)

qgis · Mar 8, 2021 · 8d90586 · 8d90586
1 parent a3be580
commit 8d90586
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.docker/docker-qgis-test.sh b/.docker/docker-qgis-test.sh
@@ -121,7 +121,7 @@ fi
 # Run tests
 ###########
 EXCLUDE_TESTS=$(cat /root/QGIS/.ci/test_blocklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)
-if ! [[ ${RUN_FLAKY_TESTS} =~ ^true$ ]]; then
+if ! [[ ${RUN_FLAKY_TESTS} == true ]]; then
   echo "Flaky tests are skipped!"
   EXCLUDE_TESTS=${EXCLUDE_TESTS}"|"$(cat /root/QGIS/.ci/test_flaky.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)
 else

diff --git a/.docker/docker-variables.env b/.docker/docker-variables.env
@@ -5,8 +5,10 @@ SEGFAULT_SIGNALS="abrt segv"
 CTEST_BUILD_COMMAND=/usr/bin/ninja
 CTEST_PARALLEL_LEVEL=1
 CTEST_BUILD_DIR=/root/QGIS
+
 # CTEST vars defined in workflow
 CTEST_BUILD_NAME
+RUN_FLAKY_TESTS
 
 # Other vars
 QGIS_NO_OVERRIDE_IMPORT=1

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -28,6 +28,7 @@ jobs:
       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
       GH_WORKSPACE: ${{ github.workspace }} # used in docker compose
       DEFAULT_UBUNTU_BASE: '20.04'
+      RUN_FLAKY_TESTS: ${{ contains( github.event.pull_request.labels.*.name, 'run flaky tests') }}
 
     runs-on: ubuntu-latest