Skip to content

Commit cceaf12

Browse files
XuehaoSunzehao-intel
authored andcommitted
azure ut coverage report fix (#252)
Signed-off-by: Sun, Xuehao <[email protected]> Signed-off-by: zehao-intel <[email protected]>
1 parent 77d2268 commit cceaf12

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

.azure-pipelines/scripts/ut/collect_log.sh

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
source /neural-compressor/.azure-pipelines/scripts/change_color.sh
2+
13
pip install coverage
24
export COVERAGE_RCFILE=/neural-compressor/.azure-pipelines/scripts/ut/coverage.file
35
coverage_log="/neural-compressor/log_dir/coverage_log"
46
coverage_log_base="/neural-compressor/log_dir/coverage_log_base"
57
coverage_compare="/neural-compressor/log_dir/coverate_compare.html"
68
cd /neural-compressor/log_dir
7-
echo "collect coverage for PR branch"
9+
10+
$BOLD_YELLOW && echo "collect coverage for PR branch" && $RESET
811
mkdir -p coverage_PR
912
cp ut-coverage-adaptor/.coverage.adaptor ./coverage_PR/
1013
cp ut-coverage-tfnewapi/.coverage.tfnewapi ./coverage_PR/
@@ -18,7 +21,8 @@ coverage report -m --rcfile=${COVERAGE_RCFILE} | tee ${coverage_log}
1821
coverage html -d log_dir/coverage_PR/htmlcov --rcfile=${COVERAGE_RCFILE}
1922
coverage xml -o log_dir/coverage_PR/coverage.xml --rcfile=${COVERAGE_RCFILE}
2023
ls -l log_dir/coverage_PR/htmlcov
21-
echo "collect coverage for baseline"
24+
25+
$BOLD_YELLOW && echo "collect coverage for baseline" && $RESET
2226
coverage erase
2327
cd /neural-compressor/log_dir
2428
mkdir -p coverage_base
@@ -34,28 +38,28 @@ coverage report -m --rcfile=${COVERAGE_RCFILE} | tee ${coverage_log_base}
3438
coverage html -d log_dir/coverage_base/htmlcov --rcfile=${COVERAGE_RCFILE}
3539
coverage xml -o log_dir/coverage_base/coverage.xml --rcfile=${COVERAGE_RCFILE}
3640
ls -l log_dir/coverage_base/htmlcov
37-
echo "compare coverage"
41+
42+
$BOLD_YELLOW && echo "compare coverage" && $RESET
3843
coverage_PR_total=$(cat ${coverage_log} | grep TOTAL | awk '{print $NF}' | sed "s|%||g")
3944
coverage_base_total=$(cat ${coverage_log_base} | grep TOTAL | awk '{print $NF}' | sed "s|%||g")
40-
echo "clear upload path"
45+
46+
$BOLD_YELLOW && echo "clear upload path" && $RESET
4147
rm -fr log_dir/coverage_PR/.coverage*
4248
rm -fr log_dir/coverage_base/.coverage*
4349
rm -fr log_dir/ut-coverage-*
4450
if [[ ${coverage_PR_total} -lt ${coverage_base_total} ]]; then
45-
decreate=$(($coverage_PR_total - $coverage_base_total))
46-
rate=$(awk 'BEGIN{printf "%.2f%\n",'$decreate/100'}')
47-
echo "Unit Test failed with covereage decrese ${rate}%"
48-
echo "compare coverage to give detail info"
51+
decrease=$(($coverage_PR_total - $coverage_base_total))
52+
rate=$(awk 'BEGIN{printf "%.2f%\n",'$decrease/100'}')
53+
$BOLD_RED && echo "Unit Test failed with coverage decrease ${rate}%" && $RESET
54+
$BOLD_RED && echo "compare coverage to give detail info" && $RESET
4955
bash -x /neural-compressor/.azure-pipelines/scripts/ut/compare_coverage.sh ${coverage_compare} ${coverage_log} ${coverage_log_base} "FAILED"
5056
exit 1
5157
else
52-
echo "Unit Test success with coverage ${coverage_PR_total}%"
53-
echo "compare coverage to give detail info"
58+
$BOLD_GREEN && echo "Unit Test success with coverage ${coverage_PR_total}%" && $RESET
59+
$BOLD_GREEN && echo "compare coverage to give detail info" && $RESET
5460
bash -x /neural-compressor/.azure-pipelines/scripts/ut/compare_coverage.sh ${coverage_compare} ${coverage_log} ${coverage_log_base} "SUCCESS"
5561
#sed "1i\Unit Test success with coverage ${coverage_PR_total}\n" ${coverage_log}
5662
fi
5763

58-
5964
#rm -r ${coverage_log}
6065
#rm -r ${coverage_log_base}
61-

.azure-pipelines/ut-basic.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ stages:
194194
displayName: 'collect logs'
195195
196196
- task: PublishPipelineArtifact@1
197+
condition: succeededOrFailed()
197198
inputs:
198199
targetPath: $(UPLOAD_PATH)
199200
artifact: $(ARTIFACT_NAME)
@@ -205,4 +206,4 @@ stages:
205206
targetType: "inline"
206207
script: |
207208
docker exec collectLogs bash -c "rm -fr /neural-compressor/* && rm -fr /neural-compressor/.* || true"
208-
displayName: "Docker clean up"
209+
displayName: "Docker clean up"

.azure-pipelines/ut-ncoder.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,3 @@ stages:
2929
utScriptFileName: 'run_ncoder'
3030
uploadPath: $(UPLOAD_PATH)
3131
utArtifact: 'ut-ncoder'
32-

0 commit comments

Comments
 (0)