Skip to content

Commit f5c96de

Browse files
committed
Fix summary line extraction
1 parent 3b2a010 commit f5c96de

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

.github/workflows/_ci.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -311,16 +311,16 @@ jobs:
311311
export TE_PATH=\${SRC_PATH_TRANSFORMER_ENGINE};
312312
313313
[[ "${{ matrix.test }}" == *unittest* ]] && xdist_args=(4 1) || xdist_args=(8 1);
314-
pytest-xdist.sh \${xdist_args[@]} /opt/output/pytest-report.jsonl bash \${TE_PATH}/qa/${{ matrix.test }}/test.sh
314+
pytest-xdist.sh \${xdist_args[@]} /opt/output/pytest-report.jsonl bash \${TE_PATH}/qa/${{ matrix.test }}/test.sh | tee /opt/output/pytest.log
315315
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
316316
NVCR_TOKEN: ${{ secrets.NVCR_TOKEN }}
317317
STATISTICS: true
318318
STATISTICS_SCRIPT: |
319-
report_json=\${JOBSET_NAME}/pytest-report.jsonl
320-
summary_line=\$(tail -n1 \${JOBSET_NAME}/*.log);
319+
report_json=\${JOBSET_NAME}/pytest-report.jsonl;
320+
summary_line=\$(tail -n1 \${JOBSET_NAME}/pytest.log);
321321
NUM_ERRORS=\$(echo \$summary_line | grep -oE '[0-9]+ error' | awk '{print \$1} END { if (!NR) print 0}');
322-
NUM_PASSED=\$(cat \$report_json | jq -r 'select(.\"\$report_type\" == "TestReport" and .when == "call" and .outcome == "passed") | .outcome' | wc -l);
323-
NUM_FAILED=\$(cat \$report_json | jq -r 'select(.\"\$report_type\" == "TestReport" and .when == "call" and .outcome == "failed") | .outcome' | wc -l);
322+
NUM_PASSED=\$(cat \$report_json | jq -r 'select(.\"\$report_type\" == \"TestReport\" and .when == \"call\" and .outcome == \"passed\") | .outcome' | wc -l);
323+
NUM_FAILED=\$(cat \$report_json | jq -r 'select(.\"\$report_type\" == \"TestReport\" and .when == \"call\" and .outcome == \"failed\") | .outcome' | wc -l);
324324
NUM_TESTS=\$((NUM_FAILED + NUM_PASSED));
325325
326326
test-nsys-jax:
@@ -350,16 +350,16 @@ jobs:
350350
COMMAND: |
351351
pip install pytest-reportlog nsys-jax[test];
352352
test_path=\$(python -c 'import importlib.resources; print(importlib.resources.files(\"nsys_jax\").joinpath(\"..\", \"tests\").resolve())');
353-
pytest --basetemp=/opt/output/pytest-tmp --report-log=/opt/output/pytest-report.jsonl \"\${test_path}\"
353+
pytest --basetemp=/opt/output/pytest-tmp --report-log=/opt/output/pytest-report.jsonl \"\${test_path}\" | tee /opt/output/pytest.log
354354
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
355355
NVCR_TOKEN: ${{ secrets.NVCR_TOKEN }}
356356
STATISTICS: true
357357
STATISTICS_SCRIPT: |
358-
report_json=\${JOBSET_NAME}/pytest-report.jsonl
359-
summary_line=\$(tail -n1 \${JOBSET_NAME}/*.log);
358+
report_json=\${JOBSET_NAME}/pytest-report.jsonl;
359+
summary_line=\$(tail -n1 \${JOBSET_NAME}/pytest.log);
360360
NUM_ERRORS=\$(echo \$summary_line | grep -oE '[0-9]+ error' | awk '{print \$1} END { if (!NR) print 0}');
361-
NUM_PASSED=\$(cat \${report_json} | jq -r 'select(.\"\$report_type\" == "TestReport" and .when == "call" and .outcome == "passed") | .outcome' | wc -l);
362-
NUM_FAILED=\$(cat \${report_json} | jq -r 'select(.\"\$report_type\" == "TestReport" and .when == "call" and .outcome == "failed") | .outcome' | wc -l);
361+
NUM_PASSED=\$(cat \${report_json} | jq -r 'select(.\"\$report_type\" == \"TestReport\" and .when == \"call\" and .outcome == \"passed\") | .outcome' | wc -l);
362+
NUM_FAILED=\$(cat \${report_json} | jq -r 'select(.\"\$report_type\" == \"TestReport\" and .when == \"call\" and .outcome == \"failed\") | .outcome' | wc -l);
363363
NUM_TESTS=\$(( NUM_PASSED + NUM_FAILED ))
364364
365365
# test-nsys-jax generates several fresh .zip archive outputs by running nsys-jax with real GPU hardware; this test

0 commit comments

Comments
 (0)