cleanup

elastic · Feb 20, 2021 · 21252ae · 21252ae
1 parent de43b3d
commit 21252ae
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
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
@@ -32,13 +32,12 @@ TEAM_ASSIGN_PATH=$5
 # 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
-  # Need to override COVERAGE_INGESTION_KIBANA_ROOT since json file has original intake worker path
-  export COVERAGE_INGESTION_KIBANA_ROOT=/dev/shm/workspace/kibana
-
   node scripts/ingest_coverage.js --verbose --path ${COVERAGE_SUMMARY_FILE} --vcsInfoPath ./VCS_INFO.txt --teamAssignmentsPath $TEAM_ASSIGN_PATH
 done
 

diff --git a/src/dev/code_coverage/shell_scripts/merge_functional.sh b/src/dev/code_coverage/shell_scripts/merge_functional.sh
@@ -4,25 +4,24 @@ COVERAGE_TEMP_DIR=/tmp/extracted_coverage/target/kibana-coverage/
 export COVERAGE_TEMP_DIR
 
 checkoutDir="$(pwd)"
-echo  "checkoutDir=${checkoutDir}"
+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 "### Clone kibana to /dev/shm/workspace/"
-mkdir -p /dev/shm/workspace/kibana
-rsync -ahSD --ignore-errors --force --delete --stats ./ /dev/shm/workspace/kibana/
-cd /dev/shm/workspace/kibana
-echo "### Show folders tree"
-ls -d -- */
 echo "### bootstrap from x-pack folder"
-# bootstrap from x-pack folder
 cd x-pack
 yarn kbn bootstrap
 # Return to project root
 cd ..
 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"
-ls -als