Skip to content

Commit 0ba5cbb

Browse files
committed
put this all behind an env flag
1 parent ac19c1a commit 0ba5cbb

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

.buildkite/pipeline-resource-definitions/kibana-on-merge.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ spec:
2626
KIBANA_SLACK_NOTIFICATIONS_ENABLED: 'true'
2727
SLACK_NOTIFICATIONS_SKIP_FOR_RETRIES: 'true'
2828
SCOUT_REPORTER_ENABLED: 'true'
29+
FTR_SMART_RETRY_ENABLED: 'false'
2930
allow_rebuilds: true
3031
branch_configuration: main 9.4 9.3 8.19
3132
default_branch: main

.buildkite/pipeline-resource-definitions/kibana-pr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ spec:
2323
KIBANA_GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
2424
GITHUB_BUILD_COMMIT_STATUS_CONTEXT: kibana-ci
2525
SCOUT_REPORTER_ENABLED: 'true'
26+
FTR_SMART_RETRY_ENABLED: 'false'
2627
allow_rebuilds: true
2728
branch_configuration: ''
2829
cancel_intermediate_builds: true

.buildkite/scripts/steps/test/ftr_configs.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,11 @@ if [[ "$failedConfigs" ]]; then
141141
buildkite-agent meta-data set "$FAILED_CONFIGS_KEY" "$failedConfigs"
142142
fi
143143

144-
store_failing_tests # attempt 1: record what failed so the retry can verify recovery
145-
apply_smart_retry # attempt 2: mark green if all previously-failing tests explicitly passed
144+
145+
if [[ "${FTR_SMART_RETRY_ENABLED:-}" =~ ^(1|true)$ ]]; then
146+
store_failing_tests # attempt 1: record what failed so the retry can verify recovery
147+
apply_smart_retry # attempt 2: mark green if all previously-failing tests explicitly passed
148+
fi
146149

147150
echo "--- FTR configs complete"
148151
printf "%s\n" "${results[@]}"

0 commit comments

Comments
 (0)