diff --git a/src/dev/code_coverage/docs/team_assignment/README.md b/src/dev/code_coverage/docs/team_assignment/README.md index bef4e74415b5a..c5b0db830ec4b 100644 --- a/src/dev/code_coverage/docs/team_assignment/README.md +++ b/src/dev/code_coverage/docs/team_assignment/README.md @@ -2,9 +2,11 @@ Team assignment occurs once per ci run. -The "orchestration" entry point is a [Jenkinsfile Scripted Pipeline](https://github.com/elastic/kibana/blob/f73bc48b3bbbb5ad2042c1aa267aea2150b7b742/.ci/Jenkinsfile_coverage#L21) -This Jenkinsfile runs a [shell script](https://github.com/elastic/kibana/blob/main/src/dev/code_coverage/shell_scripts/generate_team_assignments_and_ingest_coverage.sh#L33) that kicks everything off. -The end result is the data is ingested to our [Kibana Stats Cluster](https://kibana-stats.elastic.dev/app/dashboards#/view/58b8db70-62f9-11ea-8312-7f2d69b79843?_g=(filters%3A!()%2CrefreshInterval%3A(pause%3A!t%2Cvalue%3A0)%2Ctime%3A(from%3Anow-7d%2Cto%3Anow))) +The entry point is a [yaml config](https://buildkite.com/elastic/kibana-code-coverage-main/steps) +Within the yaml config, [this shell script](https://github.com/elastic/kibana/blob/main/.buildkite/scripts/steps/code_coverage/reporting/ingestData.sh) is used. +Search for `node scripts/generate_team_assignments.js` and you'll see how it is generated before ingestion begins. +The generated file's path is passed to the ingestion system via an environment variable: `--teamAssignmentsPath $TEAM_ASSIGN_PATH` +The ingestion system uses it [here](https://github.com/elastic/kibana/blob/main/src/dev/code_coverage/ingest_coverage/index.js#L33). ## Team Assignment Parsing (from .github/CODEOWNERS) We add additional metadata to the CODEOWNERS file. diff --git a/src/dev/code_coverage/shell_scripts/copy_jest_report.sh b/src/dev/code_coverage/shell_scripts/copy_jest_report.sh deleted file mode 100755 index 8369d5b467c02..0000000000000 --- a/src/dev/code_coverage/shell_scripts/copy_jest_report.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -EXTRACT_START_DIR=tmp/extracted_coverage -EXTRACT_END_DIR=target/kibana-coverage -COMBINED_EXRACT_DIR=/${EXTRACT_START_DIR}/${EXTRACT_END_DIR} - - -echo "### Copy combined jest report" -mkdir -p $EXTRACT_END_DIR/jest-combined -cp -r $COMBINED_EXRACT_DIR/jest-combined/. $EXTRACT_END_DIR/jest-combined/ diff --git a/src/dev/code_coverage/shell_scripts/extract_archives.sh b/src/dev/code_coverage/shell_scripts/extract_archives.sh deleted file mode 100644 index 14b35f8786d02..0000000000000 --- a/src/dev/code_coverage/shell_scripts/extract_archives.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -DOWNLOAD_DIR=/tmp/downloaded_coverage -EXTRACT_DIR=/tmp/extracted_coverage - -mkdir -p $EXTRACT_DIR - -echo "### Extracting downloaded artifacts" -for x in kibana-intake kibana-oss-tests kibana-xpack-tests; do - tar -xzf $DOWNLOAD_DIR/coverage/${x}/kibana-coverage.tar.gz -C $EXTRACT_DIR || echo "### Error 'tarring': ${x}" -done - diff --git a/src/dev/code_coverage/shell_scripts/extract_xpack_tests.sh b/src/dev/code_coverage/shell_scripts/extract_xpack_tests.sh deleted file mode 100644 index 29184584b726f..0000000000000 --- a/src/dev/code_coverage/shell_scripts/extract_xpack_tests.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -DOWNLOAD_DIR=/tmp/downloaded_coverage -EXTRACT_DIR=/tmp/extracted_coverage - -echo "### Extracting kibana-xpack-tests" -tar -xzf $DOWNLOAD_DIR/coverage/kibana-xpack-tests/kibana-coverage.tar.gz -C $EXTRACT_DIR diff --git a/src/dev/code_coverage/shell_scripts/generate_team_assignments_and_ingest_coverage.sh b/src/dev/code_coverage/shell_scripts/generate_team_assignments_and_ingest_coverage.sh deleted file mode 100644 index b7d6a4abce344..0000000000000 --- a/src/dev/code_coverage/shell_scripts/generate_team_assignments_and_ingest_coverage.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -echo "### Ingesting Code Coverage" -echo "" - -COVERAGE_JOB_NAME=$1 -export COVERAGE_JOB_NAME -echo "### debug COVERAGE_JOB_NAME: ${COVERAGE_JOB_NAME}" - -BUILD_ID=$2 -export BUILD_ID - -CI_RUN_URL=$3 -export CI_RUN_URL -echo "### debug CI_RUN_URL: ${CI_RUN_URL}" - -FETCHED_PREVIOUS=$4 -export FETCHED_PREVIOUS -echo "### debug FETCHED_PREVIOUS: ${FETCHED_PREVIOUS}" - -ES_HOST="https://${USER_FROM_VAULT}:${PASS_FROM_VAULT}@${HOST_FROM_VAULT}" -export ES_HOST - -STATIC_SITE_URL_BASE='https://kibana-coverage.elastic.dev' -export STATIC_SITE_URL_BASE - -TEAM_ASSIGN_PATH=$5 - -BUFFER_SIZE=500 -export BUFFER_SIZE - -# Build team assignments dat file -node scripts/generate_team_assignments.js --verbose --src .github/CODEOWNERS --dest $TEAM_ASSIGN_PATH - -# Need to override COVERAGE_INGESTION_KIBANA_ROOT since json file has original intake worker path -export COVERAGE_INGESTION_KIBANA_ROOT=/dev/shm/workspace/kibana - -for x in functional jest; do - echo "### Ingesting coverage for ${x}" - COVERAGE_SUMMARY_FILE=target/kibana-coverage/${x}-combined/coverage-summary.json - # running in background to speed up ingestion - node scripts/ingest_coverage.js --path ${COVERAGE_SUMMARY_FILE} --vcsInfoPath ./VCS_INFO.txt --teamAssignmentsPath $TEAM_ASSIGN_PATH & -done -wait - -echo "### Ingesting Code Coverage - Complete" -echo "" diff --git a/src/dev/code_coverage/shell_scripts/merge_functional.sh b/src/dev/code_coverage/shell_scripts/merge_functional.sh deleted file mode 100755 index 68370910e6ad7..0000000000000 --- a/src/dev/code_coverage/shell_scripts/merge_functional.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -COVERAGE_TEMP_DIR=/tmp/extracted_coverage/target/kibana-coverage/ -export COVERAGE_TEMP_DIR - -checkoutDir="$(pwd)" -echo "### checkoutDir=${checkoutDir}" - -coverageBasePath="/dev/shm/workspace" -echo "### Clone kibana to ${coverageBasePath}" -mkdir -p "$coverageBasePath/kibana" -rsync -ahSD --ignore-errors --force --delete --stats ./ "$coverageBasePath/kibana/" -cd "$coverageBasePath/kibana" - -echo "### bootstrap" -yarn kbn bootstrap -echo "### Merge coverage reports" -yarn nyc report --nycrc-path src/dev/code_coverage/nyc_config/nyc.functional.config.js - -echo "### Copy 'target' to ${checkoutDir}" -rsync -ahSD --ignore-errors --force --delete --stats target "$checkoutDir/" - -echo "### Back to $checkoutDir" -cd "$checkoutDir"