Commit 0a78ab25 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'fix-wrong-require-in-flaky_tests-support-file' into 'master'

Fix wrong require in spec/support/flaky_tests.rb

See merge request gitlab-org/gitlab!74597
parents 6c981fe6 5c600866
...@@ -579,6 +579,7 @@ rspec:skipped-flaky-tests-report: ...@@ -579,6 +579,7 @@ rspec:skipped-flaky-tests-report:
variables: variables:
SKIPPED_FLAKY_TESTS_REPORT: skipped_flaky_tests_report.txt SKIPPED_FLAKY_TESTS_REPORT: skipped_flaky_tests_report.txt
before_script: before_script:
- 'echo "SKIP_FLAKY_TESTS_AUTOMATICALLY: $SKIP_FLAKY_TESTS_AUTOMATICALLY"'
- mkdir -p rspec_flaky - mkdir -p rspec_flaky
script: script:
- find rspec_flaky/ -type f -name 'skipped_flaky_tests_*_report.txt' -exec cat {} + >> "${SKIPPED_FLAKY_TESTS_REPORT}" - find rspec_flaky/ -type f -name 'skipped_flaky_tests_*_report.txt' -exec cat {} + >> "${SKIPPED_FLAKY_TESTS_REPORT}"
......
...@@ -159,6 +159,7 @@ function rspec_paralellized_job() { ...@@ -159,6 +159,7 @@ function rspec_paralellized_job() {
fi fi
echo "KNAPSACK_TEST_FILE_PATTERN: ${KNAPSACK_TEST_FILE_PATTERN}" echo "KNAPSACK_TEST_FILE_PATTERN: ${KNAPSACK_TEST_FILE_PATTERN}"
echo "SKIP_FLAKY_TESTS_AUTOMATICALLY: ${SKIP_FLAKY_TESTS_AUTOMATICALLY}"
if [[ -d "ee/" ]]; then if [[ -d "ee/" ]]; then
export KNAPSACK_GENERATE_REPORT="true" export KNAPSACK_GENERATE_REPORT="true"
......
...@@ -4,7 +4,7 @@ return unless ENV['CI'] ...@@ -4,7 +4,7 @@ return unless ENV['CI']
return unless ENV['SKIP_FLAKY_TESTS_AUTOMATICALLY'] == "true" return unless ENV['SKIP_FLAKY_TESTS_AUTOMATICALLY'] == "true"
return if ENV['CI_MERGE_REQUEST_LABELS'].to_s.include?('pipeline:run-flaky-tests') return if ENV['CI_MERGE_REQUEST_LABELS'].to_s.include?('pipeline:run-flaky-tests')
require_relative '../tooling/rspec_flaky/report' require_relative '../../tooling/rspec_flaky/report'
RSpec.configure do |config| RSpec.configure do |config|
$flaky_test_example_ids = begin # rubocop:disable Style/GlobalVars $flaky_test_example_ids = begin # rubocop:disable Style/GlobalVars
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment