diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 405346d68dab3cad5215f0519780fdbc6eb6b241..314f99c5f41eb50abe4f70e87f91c005d5088cf9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,6 +80,7 @@ variables: CACHE_CLASSES: "true" CHECK_PRECOMPILED_ASSETS: "true" FF_USE_FASTZIP: "true" + SKIP_FLAKY_TESTS_AUTOMATICALLY: "true" DOCS_REVIEW_APPS_DOMAIN: "178.62.207.141.nip.io" DOCS_GITLAB_REPO_SUFFIX: "ee" diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md index cde44a8eb014b23b4b3bdd2d8d2fe31ed01bad94..a9c6890509537f3d294f58e52e037aec5545151a 100644 --- a/doc/development/pipelines.md +++ b/doc/development/pipelines.md @@ -170,10 +170,9 @@ After that, the next pipeline uses the up-to-date `knapsack/report-master.json` ### Flaky tests -Tests that are [known to be flaky](testing_guide/flaky_tests.md#automatic-retries-and-flaky-tests-detection) are: - -- skipped if the `$SKIP_FLAKY_TESTS_AUTOMATICALLY` variable is set to `true` (`false` by default) -- run if `$SKIP_FLAKY_TESTS_AUTOMATICALLY` variable is not set to `true` or if the `~"pipeline:run-flaky-tests"` label is set on the MR +Tests that are [known to be flaky](testing_guide/flaky_tests.md#automatic-retries-and-flaky-tests-detection) are +skipped unless the `$SKIP_FLAKY_TESTS_AUTOMATICALLY` variable is set to `false` or if the `~"pipeline:run-flaky-tests"` +label is set on the MR. ### Monitoring diff --git a/spec/support/flaky_tests.rb b/spec/support/flaky_tests.rb index 0c211af695dfb26323632c41ab08356069ea9e32..5ce55c47aab552c996726f08c25d87bd18a3daed 100644 --- a/spec/support/flaky_tests.rb +++ b/spec/support/flaky_tests.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true return unless ENV['CI'] -return unless ENV['SKIP_FLAKY_TESTS_AUTOMATICALLY'] == "true" +return if ENV['SKIP_FLAKY_TESTS_AUTOMATICALLY'] == "false" return if ENV['CI_MERGE_REQUEST_LABELS'].to_s.include?('pipeline:run-flaky-tests') require_relative '../../tooling/rspec_flaky/report'