@@ -7,44 +7,51 @@ source .buildkite/scripts/steps/functional/common.sh
77BUILDKITE_PARALLEL_JOB=${BUILDKITE_PARALLEL_JOB:- }
88SCOUT_CONFIG_GROUP_KEY=${SCOUT_CONFIG_GROUP_KEY:- }
99SCOUT_CONFIG_GROUP_TYPE=${SCOUT_CONFIG_GROUP_TYPE:- }
10+ SCOUT_CONFIG=${SCOUT_CONFIG:- }
1011
11- if [ " $SCOUT_CONFIG_GROUP_KEY " == " " ] && [ " $BUILDKITE_PARALLEL_JOB " == " " ] ; then
12- echo " Missing SCOUT_CONFIG_GROUP_KEY env var "
13- exit 1
14- fi
12+ EXTRA_ARGS= ${FTR_EXTRA_ARGS :- }
13+ test -z " $EXTRA_ARGS " || buildkite-agent meta-data set " ftr-extra-args " " $EXTRA_ARGS "
14+
15+ configs= " "
1516
1617if [ " $SCOUT_CONFIG_GROUP_TYPE " == " " ]; then
1718 echo " Missing SCOUT_CONFIG_GROUP_TYPE env var"
1819 exit 1
1920fi
2021
21- EXTRA_ARGS=${FTR_EXTRA_ARGS:- }
22- test -z " $EXTRA_ARGS " || buildkite-agent meta-data set " ftr-extra-args" " $EXTRA_ARGS "
23-
24- export JOB=" $SCOUT_CONFIG_GROUP_KEY "
25-
26- FAILED_CONFIGS_KEY=" ${BUILDKITE_STEP_ID}${SCOUT_CONFIG_GROUP_KEY} "
27-
28- configs=" "
2922group=$SCOUT_CONFIG_GROUP_TYPE
3023
24+ if [ " $SCOUT_CONFIG " != " " ]; then
25+ configs=" $SCOUT_CONFIG "
26+ export JOB=" $SCOUT_CONFIG "
27+ FAILED_CONFIGS_KEY=" ${BUILDKITE_STEP_ID}${SCOUT_CONFIG} "
28+ elif [ " $SCOUT_CONFIG_GROUP_KEY " != " " ]; then
29+ export JOB=" $SCOUT_CONFIG_GROUP_KEY "
30+ FAILED_CONFIGS_KEY=" ${BUILDKITE_STEP_ID}${SCOUT_CONFIG_GROUP_KEY} "
31+ else
32+ if [ " $BUILDKITE_PARALLEL_JOB " == " " ]; then
33+ echo " Missing SCOUT_CONFIG_GROUP_KEY or SCOUT_CONFIG env var"
34+ exit 1
35+ fi
36+ fi
37+
3138# The first retry should only run the configs that failed in the previous attempt
3239# Any subsequent retries, which would generally only happen by someone clicking the button in the UI, will run everything
33- if [[ ! " $configs " && " ${BUILDKITE_RETRY_COUNT:- 0} " == " 1" ]]; then
40+ if [[ -z " $configs " && " ${BUILDKITE_RETRY_COUNT:- 0} " == " 1" ]]; then
3441 configs=$( buildkite-agent meta-data get " $FAILED_CONFIGS_KEY " --default ' ' )
35- if [[ " $configs " ]]; then
42+ if [[ -n " $configs " ]]; then
3643 echo " --- Retrying only failed configs"
3744 echo " $configs "
3845 fi
3946fi
4047
41- if [ " $configs " == " " ] && [ " $SCOUT_CONFIG_GROUP_KEY " != " " ]; then
48+ if [ -z " $configs " ] && [ " $SCOUT_CONFIG_GROUP_KEY " != " " ]; then
4249 echo " --- downloading scout test configuration"
4350 download_artifact scout_playwright_configs.json .
4451 configs=$( jq -r ' .[env.SCOUT_CONFIG_GROUP_KEY].configs[]' scout_playwright_configs.json)
4552fi
4653
47- if [ " $configs " == " " ]; then
54+ if [ -z " $configs " ]; then
4855 echo " unable to determine configs to run"
4956 exit 1
5057fi
0 commit comments