Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[QA][Code Coverage] follow up pr for ftr auto config handling & fix m…
…erge (#131734) * [QA][Code Coverage] fixup for auto config handling pr ## Summary Embed buildkite pipeline definition. Follow up pr to change cc per auto config handling. Also, resolves #132706 Increase worker count for `node scripts/build_kibana_platform_plugins` to 4 workers. Normalize file names within coverage files such that nyc correctly builds the combined summaries. _Ci runs this on myriad servers, so the paths are different, which "breaks" nyc's output_ Split the final merge of functional coverage into 2 passes due to [nyc issue](istanbuljs/nyc#1263) Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
- Loading branch information
1 parent
e310b20
commit 5f950e6
Showing
16 changed files
with
476 additions
and
158 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| steps: | ||
| - command: .buildkite/scripts/lifecycle/pre_build.sh | ||
| label: Pre-Build | ||
| timeout_in_minutes: 10 | ||
| agents: | ||
| queue: kibana-default | ||
|
|
||
| - wait | ||
|
|
||
| - command: .buildkite/scripts/steps/test/pick_test_group_run_order.sh | ||
| label: 'Pick Test Group Run Order' | ||
| agents: | ||
| queue: kibana-default | ||
| env: | ||
| FTR_CONFIGS_DEPS: '' | ||
| LIMIT_CONFIG_TYPE: 'unit,functional,integration' | ||
| JEST_UNIT_SCRIPT: '.buildkite/scripts/steps/code_coverage/jest.sh' | ||
| JEST_INTEGRATION_SCRIPT: '.buildkite/scripts/steps/code_coverage/jest_integration.sh' | ||
| FTR_CONFIGS_SCRIPT: '.buildkite/scripts/steps/code_coverage/ftr_configs.sh' | ||
|
|
||
| - command: .buildkite/scripts/steps/code_coverage/ingest.sh | ||
| label: 'Merge and Ingest' | ||
| agents: | ||
| queue: c2-16 | ||
| depends_on: | ||
| - jest | ||
| - jest-integration | ||
| - ftr-configs | ||
| timeout_in_minutes: 30 | ||
| key: ingest |
14 changes: 14 additions & 0 deletions
14
.buildkite/scripts/steps/code_coverage/clean_coverage_paths.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
| * in compliance with, at your election, the Elastic License 2.0 or the Server | ||
| * Side Public License, v 1. | ||
| */ | ||
|
|
||
| const { readFileSync, writeFileSync } = require('fs'); | ||
|
|
||
| const file = process.argv[2]; | ||
| const search = process.argv[3]; | ||
| const replace = process.argv[4]; | ||
| writeFileSync(file, readFileSync(file).toString().replaceAll(search, replace)); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -euo pipefail | ||
|
|
||
| source .buildkite/scripts/common/util.sh | ||
| source .buildkite/scripts/steps/code_coverage/merge.sh | ||
| source .buildkite/scripts/steps/code_coverage/util.sh | ||
| source .buildkite/scripts/steps/code_coverage/node_scripts.sh | ||
|
|
||
| export CODE_COVERAGE=1 # Kibana is bootstrapped differently for code coverage | ||
| echo "--- KIBANA_DIR: $KIBANA_DIR" | ||
| .buildkite/scripts/bootstrap.sh | ||
| buildPlatformPlugins | ||
| is_test_execution_step | ||
|
|
||
| export JOB_NUM=$BUILDKITE_PARALLEL_JOB | ||
| export JOB=ftr-configs-${JOB_NUM} | ||
|
|
||
| functionalTarget="$KIBANA_DIR/target/kibana-coverage/functional" | ||
| FAILED_CONFIGS_KEY="${BUILDKITE_STEP_ID}${BUILDKITE_PARALLEL_JOB:-0}" | ||
|
|
||
| # a FTR failure will result in the script returning an exit code of 10 | ||
| exitCode=0 | ||
| configs="${FTR_CONFIG:-}" | ||
|
|
||
| if [[ "$configs" == "" ]]; then | ||
| echo "--- Downloading ftr test run order" | ||
| buildkite-agent artifact download ftr_run_order.json . | ||
| configs=$(jq -r '.groups[env.JOB_NUM | tonumber].names | .[]' ftr_run_order.json) | ||
| fi | ||
|
|
||
| echo "--- Config(s) for this FTR Group:" | ||
| echo "${configs[@]}" | ||
|
|
||
| failedConfigs="" | ||
| results=() | ||
|
|
||
| while read -r config; do | ||
| if [[ ! "$config" ]]; then | ||
| continue | ||
| fi | ||
| echo "--- Begin config $config" | ||
|
|
||
| start=$(date +%s) | ||
|
|
||
| # prevent non-zero exit code from breaking the loop | ||
| set +e | ||
| runFTRInstrumented "$config" | ||
| lastCode=$? | ||
| set -e | ||
| dasherize() { | ||
| local withoutExtension=${1%.*} | ||
| dasherized=$(echo "$withoutExtension" | tr '\/' '\-') | ||
| } | ||
| dasherize "$config" | ||
|
|
||
| if [[ -d "$functionalTarget" ]]; then | ||
| echo "--- Server and / or Client side code coverage collected" | ||
| if [[ -f "target/kibana-coverage/functional/coverage-final.json" ]]; then | ||
| # We potentially have more than one file with the same name being created, | ||
| # so we make them unique here. | ||
| mv target/kibana-coverage/functional/coverage-final.json "target/kibana-coverage/functional/${dasherized}-server-coverage.json" | ||
| fi | ||
| fi | ||
|
|
||
| timeSec=$(($(date +%s) - start)) | ||
| if [[ $timeSec -gt 60 ]]; then | ||
| min=$((timeSec / 60)) | ||
| sec=$((timeSec - (min * 60))) | ||
| duration="${min}m ${sec}s" | ||
| else | ||
| duration="${timeSec}s" | ||
| fi | ||
|
|
||
| results+=("- $config | ||
| duration: ${duration} | ||
| result: ${lastCode}") | ||
|
|
||
| if [ $lastCode -ne 0 ]; then | ||
| exitCode=10 | ||
| echo "FTR exited with code $lastCode" | ||
| echo "^^^ +++" | ||
|
|
||
| if [[ "$failedConfigs" ]]; then | ||
| failedConfigs="${failedConfigs}"$'\n'"$config" | ||
| else | ||
| failedConfigs="$config" | ||
| fi | ||
| fi | ||
|
|
||
| echo "--- Config complete: $config" | ||
| done <<<"$configs" | ||
|
|
||
| # Each browser unload event, creates a new coverage file. | ||
| # So, we merge them here. | ||
| if [[ -d "$functionalTarget" ]]; then | ||
| reportMergeFunctional | ||
| uniqueifyFunctional "$(date +%s)" | ||
| else | ||
| echo "--- Code coverage not found in: $functionalTarget" | ||
| fi | ||
|
|
||
| # Nyc uses matching absolute paths for reporting / merging | ||
| # So, set all coverage json files to a specific prefx. | ||
| # The prefix will be changed to the kibana dir, in the final stage, | ||
| # so nyc doesnt error. | ||
| echo "--- Normalize file paths prefix" | ||
| replacePaths "$KIBANA_DIR/target/kibana-coverage/functional" "$KIBANA_DIR" "CC_REPLACEMENT_ANCHOR" | ||
|
|
||
| if [[ "$failedConfigs" ]]; then | ||
| buildkite-agent meta-data set "$FAILED_CONFIGS_KEY" "$failedConfigs" | ||
| fi | ||
|
|
||
| echo "--- FTR configs complete, result(s):" | ||
| printf "%s\n" "${results[@]}" | ||
| echo "" | ||
|
|
||
| # So the last step "knows" this config ran | ||
| uploadRanFile "ftr_configs" | ||
|
|
||
| # Force exit 0 to ensure the next build step starts. | ||
| exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.