From aaaec5867593e1159633f74fa6368aa7c19aacad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me> Date: Thu, 4 Apr 2024 09:57:02 +0200 Subject: [PATCH] ci: Generate Knapsack reports even in FOSS jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable <remy@rymai.me> --- scripts/rspec_helpers.sh | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/scripts/rspec_helpers.sh b/scripts/rspec_helpers.sh index 2a4d106b4b1ee..fdc9720830bfb 100644 --- a/scripts/rspec_helpers.sh +++ b/scripts/rspec_helpers.sh @@ -267,18 +267,15 @@ function rspec_parallelized_job() { export KNAPSACK_TEST_FILE_PATTERN=$(ruby -r./tooling/quality/test_level.rb -e "puts Quality::TestLevel.new(${spec_folder_prefixes}).pattern(:${test_level})") export FLAKY_RSPEC_REPORT_PATH="${rspec_flaky_folder_path}all_${report_name}_report.json" export NEW_FLAKY_RSPEC_REPORT_PATH="${rspec_flaky_folder_path}new_${report_name}_report.json" + export KNAPSACK_GENERATE_REPORT="true" + export FLAKY_RSPEC_GENERATE_REPORT="true" - if [[ -d "ee/" ]]; then - export KNAPSACK_GENERATE_REPORT="true" - export FLAKY_RSPEC_GENERATE_REPORT="true" - - if [[ ! -f $FLAKY_RSPEC_REPORT_PATH ]]; then - echo "{}" > "${FLAKY_RSPEC_REPORT_PATH}" - fi + if [[ ! -f $FLAKY_RSPEC_REPORT_PATH ]]; then + echo "{}" > "${FLAKY_RSPEC_REPORT_PATH}" + fi - if [[ ! -f $NEW_FLAKY_RSPEC_REPORT_PATH ]]; then - echo "{}" > "${NEW_FLAKY_RSPEC_REPORT_PATH}" - fi + if [[ ! -f $NEW_FLAKY_RSPEC_REPORT_PATH ]]; then + echo "{}" > "${NEW_FLAKY_RSPEC_REPORT_PATH}" fi debug_rspec_variables -- GitLab