mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 17:59:23 -04:00
[QA][Code Coverage] Drop functional code coverage (#133553)
* [QA][Code Coverage] Drop functional code coverage * Drop ftr configs dependency. * Still dropping missed mentions of functional
This commit is contained in:
parent
479f31609a
commit
747b898efb
5 changed files with 33 additions and 25 deletions
|
@ -13,7 +13,8 @@ steps:
|
||||||
queue: kibana-default
|
queue: kibana-default
|
||||||
env:
|
env:
|
||||||
FTR_CONFIGS_DEPS: ''
|
FTR_CONFIGS_DEPS: ''
|
||||||
LIMIT_CONFIG_TYPE: 'unit,functional,integration'
|
# LIMIT_CONFIG_TYPE: 'unit,functional,integration'
|
||||||
|
LIMIT_CONFIG_TYPE: 'unit,integration'
|
||||||
JEST_UNIT_SCRIPT: '.buildkite/scripts/steps/code_coverage/jest.sh'
|
JEST_UNIT_SCRIPT: '.buildkite/scripts/steps/code_coverage/jest.sh'
|
||||||
JEST_INTEGRATION_SCRIPT: '.buildkite/scripts/steps/code_coverage/jest_integration.sh'
|
JEST_INTEGRATION_SCRIPT: '.buildkite/scripts/steps/code_coverage/jest_integration.sh'
|
||||||
FTR_CONFIGS_SCRIPT: '.buildkite/scripts/steps/code_coverage/ftr_configs.sh'
|
FTR_CONFIGS_SCRIPT: '.buildkite/scripts/steps/code_coverage/ftr_configs.sh'
|
||||||
|
@ -25,6 +26,6 @@ steps:
|
||||||
depends_on:
|
depends_on:
|
||||||
- jest
|
- jest
|
||||||
- jest-integration
|
- jest-integration
|
||||||
- ftr-configs
|
# - ftr-configs
|
||||||
timeout_in_minutes: 30
|
timeout_in_minutes: 30
|
||||||
key: ingest
|
key: ingest
|
||||||
|
|
|
@ -27,7 +27,7 @@ echo "--- Upload new git sha"
|
||||||
|
|
||||||
echo "--- Download coverage artifacts"
|
echo "--- Download coverage artifacts"
|
||||||
buildkite-agent artifact download target/kibana-coverage/jest/* .
|
buildkite-agent artifact download target/kibana-coverage/jest/* .
|
||||||
buildkite-agent artifact download target/kibana-coverage/functional/* .
|
#buildkite-agent artifact download target/kibana-coverage/functional/* .
|
||||||
buildkite-agent artifact download target/ran_files/* .
|
buildkite-agent artifact download target/ran_files/* .
|
||||||
ls -l target/ran_files/* || echo "### No ran-files found"
|
ls -l target/ran_files/* || echo "### No ran-files found"
|
||||||
|
|
||||||
|
@ -42,20 +42,20 @@ echo "--- Jest: Reset file paths prefix, merge coverage files, and generate the
|
||||||
replacePaths "$KIBANA_DIR/target/kibana-coverage/jest" "CC_REPLACEMENT_ANCHOR" "$KIBANA_DIR"
|
replacePaths "$KIBANA_DIR/target/kibana-coverage/jest" "CC_REPLACEMENT_ANCHOR" "$KIBANA_DIR"
|
||||||
yarn nyc report --nycrc-path src/dev/code_coverage/nyc_config/nyc.jest.config.js
|
yarn nyc report --nycrc-path src/dev/code_coverage/nyc_config/nyc.jest.config.js
|
||||||
|
|
||||||
echo "--- Functional: Reset file paths prefix, merge coverage files, and generate the final combined report"
|
#echo "--- Functional: Reset file paths prefix, merge coverage files, and generate the final combined report"
|
||||||
# Functional: Reset file paths prefix to Kibana Dir of final worker
|
# Functional: Reset file paths prefix to Kibana Dir of final worker
|
||||||
set +e
|
#set +e
|
||||||
sed -ie "s|CC_REPLACEMENT_ANCHOR|${KIBANA_DIR}|g" target/kibana-coverage/functional/*.json
|
#sed -ie "s|CC_REPLACEMENT_ANCHOR|${KIBANA_DIR}|g" target/kibana-coverage/functional/*.json
|
||||||
echo "--- Begin Split and Merge for Functional"
|
#echo "--- Begin Split and Merge for Functional"
|
||||||
splitCoverage target/kibana-coverage/functional
|
#splitCoverage target/kibana-coverage/functional
|
||||||
splitMerge
|
#splitMerge
|
||||||
set -e
|
#set -e
|
||||||
|
|
||||||
echo "--- Archive and upload combined reports"
|
echo "--- Archive and upload combined reports"
|
||||||
collectAndUpload target/kibana-coverage/jest/kibana-jest-coverage.tar.gz \
|
collectAndUpload target/kibana-coverage/jest/kibana-jest-coverage.tar.gz \
|
||||||
target/kibana-coverage/jest-combined
|
target/kibana-coverage/jest-combined
|
||||||
collectAndUpload target/kibana-coverage/functional/kibana-functional-coverage.tar.gz \
|
#collectAndUpload target/kibana-coverage/functional/kibana-functional-coverage.tar.gz \
|
||||||
target/kibana-coverage/functional-combined
|
# target/kibana-coverage/functional-combined
|
||||||
|
|
||||||
echo "--- Upload coverage static site"
|
echo "--- Upload coverage static site"
|
||||||
.buildkite/scripts/steps/code_coverage/reporting/uploadStaticSite.sh
|
.buildkite/scripts/steps/code_coverage/reporting/uploadStaticSite.sh
|
||||||
|
|
|
@ -38,14 +38,20 @@ echo "### Generate Team Assignments"
|
||||||
CI_STATS_DISABLED=true node scripts/generate_team_assignments.js \
|
CI_STATS_DISABLED=true node scripts/generate_team_assignments.js \
|
||||||
--verbose --src '.github/CODEOWNERS' --dest $TEAM_ASSIGN_PATH
|
--verbose --src '.github/CODEOWNERS' --dest $TEAM_ASSIGN_PATH
|
||||||
|
|
||||||
for x in functional jest; do
|
#for x in functional jest; do
|
||||||
echo "### Ingesting coverage for ${x}"
|
# echo "### Ingesting coverage for ${x}"
|
||||||
COVERAGE_SUMMARY_FILE="target/kibana-coverage/${x}-combined/coverage-summary.json"
|
# COVERAGE_SUMMARY_FILE="target/kibana-coverage/${x}-combined/coverage-summary.json"
|
||||||
|
#
|
||||||
|
# CI_STATS_DISABLED=true node scripts/ingest_coverage.js --path ${COVERAGE_SUMMARY_FILE} \
|
||||||
|
# --vcsInfoPath ./VCS_INFO.txt --teamAssignmentsPath $TEAM_ASSIGN_PATH &
|
||||||
|
#done
|
||||||
|
#wait
|
||||||
|
|
||||||
CI_STATS_DISABLED=true node scripts/ingest_coverage.js --path ${COVERAGE_SUMMARY_FILE} \
|
echo "### Ingesting coverage for JEST"
|
||||||
--vcsInfoPath ./VCS_INFO.txt --teamAssignmentsPath $TEAM_ASSIGN_PATH &
|
COVERAGE_SUMMARY_FILE="target/kibana-coverage/jest-combined/coverage-summary.json"
|
||||||
done
|
|
||||||
wait
|
CI_STATS_DISABLED=true node scripts/ingest_coverage.js --path ${COVERAGE_SUMMARY_FILE} \
|
||||||
|
--vcsInfoPath ./VCS_INFO.txt --teamAssignmentsPath $TEAM_ASSIGN_PATH
|
||||||
|
|
||||||
echo "--- Ingesting Code Coverage - Complete"
|
echo "--- Ingesting Code Coverage - Complete"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
|
@ -4,7 +4,6 @@ set -euo pipefail
|
||||||
|
|
||||||
cat << EOF > src/dev/code_coverage/www/index_partial_2.html
|
cat << EOF > src/dev/code_coverage/www/index_partial_2.html
|
||||||
<a class="nav-link" href="https://kibana-coverage.elastic.dev/${TIME_STAMP}/jest-combined/index.html">Latest Jest</a>
|
<a class="nav-link" href="https://kibana-coverage.elastic.dev/${TIME_STAMP}/jest-combined/index.html">Latest Jest</a>
|
||||||
<a class="nav-link" href="https://kibana-coverage.elastic.dev/${TIME_STAMP}/functional-combined/index.html">Latest FTR</a>
|
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
|
@ -26,4 +25,4 @@ cat << EOF > src/dev/code_coverage/www/index_partial_2.html
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cat src/dev/code_coverage/www/index_partial.html > src/dev/code_coverage/www/index.html
|
cat src/dev/code_coverage/www/index_partial.html > src/dev/code_coverage/www/index.html
|
||||||
cat src/dev/code_coverage/www/index_partial_2.html >> src/dev/code_coverage/www/index.html
|
cat src/dev/code_coverage/www/index_partial_2.html >> src/dev/code_coverage/www/index.html
|
||||||
|
|
|
@ -11,8 +11,10 @@ for x in 'src/dev/code_coverage/www/index.html' 'src/dev/code_coverage/www/404.h
|
||||||
gsutil -m -q cp -r -a public-read -z js,css,html ${x} ${uploadPrefix}
|
gsutil -m -q cp -r -a public-read -z js,css,html ${x} ${uploadPrefix}
|
||||||
done
|
done
|
||||||
|
|
||||||
gsutil -m -q cp -r -a public-read -z js,css,html ${x} ${uploadPrefixWithTimeStamp}
|
#gsutil -m -q cp -r -a public-read -z js,css,html ${x} ${uploadPrefixWithTimeStamp}
|
||||||
|
#
|
||||||
|
#for x in 'target/kibana-coverage/functional-combined' 'target/kibana-coverage/jest-combined'; do
|
||||||
|
# gsutil -m -q cp -r -a public-read -z js,css,html ${x} ${uploadPrefixWithTimeStamp}
|
||||||
|
#done
|
||||||
|
|
||||||
for x in 'target/kibana-coverage/functional-combined' 'target/kibana-coverage/jest-combined'; do
|
gsutil -m -q cp -r -a public-read -z js,css,html 'target/kibana-coverage/jest-combined' ${uploadPrefixWithTimeStamp}
|
||||||
gsutil -m -q cp -r -a public-read -z js,css,html ${x} ${uploadPrefixWithTimeStamp}
|
|
||||||
done
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue