mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
* fix ftr script when called with parallelism
* Update ftr_configs.sh
(cherry picked from commit 9619311120
)
Co-authored-by: Spencer <spencer@elastic.co>
This commit is contained in:
parent
7513eeb2aa
commit
2e28b4671b
2 changed files with 9 additions and 4 deletions
|
@ -133,7 +133,7 @@ for (const testSuite of testSuites) {
|
|||
env: {
|
||||
FTR_CONFIG: testSuite.ftrConfig,
|
||||
},
|
||||
label: `FTR Config: ${testSuite.ftrConfig}`,
|
||||
label: `${testSuite.ftrConfig}`,
|
||||
parallelism: testSuite.count,
|
||||
concurrency,
|
||||
concurrency_group: process.env.UUID,
|
||||
|
|
|
@ -4,9 +4,9 @@ set -euo pipefail
|
|||
|
||||
source .buildkite/scripts/steps/functional/common.sh
|
||||
|
||||
|
||||
BUILDKITE_PARALLEL_JOB=${BUILDKITE_PARALLEL_JOB:-}
|
||||
FTR_CONFIG_GROUP_KEY=${FTR_CONFIG_GROUP_KEY:-}
|
||||
if [ "$FTR_CONFIG_GROUP_KEY" == "" ]; then
|
||||
if [ "$FTR_CONFIG_GROUP_KEY" == "" ] && [ "$BUILDKITE_PARALLEL_JOB" == "" ]; then
|
||||
echo "Missing FTR_CONFIG_GROUP_KEY env var"
|
||||
exit 1
|
||||
fi
|
||||
|
@ -30,12 +30,17 @@ if [[ ! "$configs" && "${BUILDKITE_RETRY_COUNT:-0}" == "1" ]]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
if [[ "$configs" == "" ]]; then
|
||||
if [ "$configs" == "" ] && [ "$FTR_CONFIG_GROUP_KEY" != "" ]; then
|
||||
echo "--- downloading ftr test run order"
|
||||
buildkite-agent artifact download ftr_run_order.json .
|
||||
configs=$(jq -r '.[env.FTR_CONFIG_GROUP_KEY].names[]' ftr_run_order.json)
|
||||
fi
|
||||
|
||||
if [ "$configs" == "" ]; then
|
||||
echo "unable to determine configs to run"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
failedConfigs=""
|
||||
results=()
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue