Skip to content

Commit bad92a9

Browse files
committed
put bail behind a env variable too
1 parent 0ba5cbb commit bad92a9

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ if [ "$FTR_CONFIG_GROUP_KEY" == "" ] && [ "$BUILDKITE_PARALLEL_JOB" == "" ]; the
1212
exit 1
1313
fi
1414

15+
BAIL_ARG=""
16+
if [[ "${FTR_SMART_RETRY_ENABLED:-}" =~ ^(1|true)$ ]]; then
17+
BAIL_ARG="--bail"
18+
fi
19+
1520
EXTRA_ARGS=${FTR_EXTRA_ARGS:-}
1621
test -z "$EXTRA_ARGS" || buildkite-agent meta-data set "ftr-extra-args" "$EXTRA_ARGS"
1722

@@ -53,7 +58,7 @@ while read -r config; do
5358
continue;
5459
fi
5560

56-
FULL_COMMAND="node scripts/functional_tests --config $config $EXTRA_ARGS"
61+
FULL_COMMAND="node scripts/functional_tests $BAIL_ARG --config $config $EXTRA_ARGS"
5762

5863
# see if this config has already been executed successfully
5964
CONFIG_EXECUTION_KEY="${config}_executed"
@@ -93,6 +98,7 @@ while read -r config; do
9398
node ./scripts/functional_tests \
9499
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \
95100
--config="$config" \
101+
$BAIL_ARG \
96102
"$EXTRA_ARGS"
97103
lastCode=$?
98104
set -e;

0 commit comments

Comments
 (0)