Skip to content

Commit 334e290

Browse files
committed
selinux: improve collect of the results
1 parent 1308d89 commit 334e290

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

.github/workflows/GnuTests.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,14 @@ jobs:
200200
- name: Selinux - Run selinux tests as root
201201
run: |
202202
lima bash -c "cd ~/work/uutils/ && CI=1 bash util/run-gnu-test.sh run-root \$(cat selinux-tests.txt)"
203-
- name: Selinux - Collect test logs
203+
204+
- name: Selinux - Extract testing info from indiv logs into JSON
205+
shell: bash
206+
run : |
207+
lima bash -c "cd ~/work/gnu/ && python3 ../uutils/util/gnu-json-result.py tests > tests-selinux/selinux-gnu-full-result.json && cat tests-selinux/selinux-gnu-full-result.json"
208+
209+
- name: Selinux - Collect test logs and test results
204210
run: |
205-
# Create directories for SELinux test logs
206211
mkdir -p ${{ steps.vars.outputs.path_GNU_tests }}-selinux
207212
208213
# Copy the test logs from the Lima VM to the host
@@ -211,8 +216,9 @@ jobs:
211216
rsync -v -a -e ssh lima-default:~/work/gnu/tests-selinux/ ./${{ steps.vars.outputs.path_GNU_tests }}-selinux/
212217
213218
# Copy SELinux logs to the main test directory for integrated processing
214-
cp -f ${{ steps.vars.outputs.path_GNU_tests }}-selinux/test-suite.log ${{ steps.vars.outputs.path_GNU_tests }}/selinux-test-suite.log || echo "No SELinux test-suite.log found"
215-
cp -f ${{ steps.vars.outputs.path_GNU_tests }}-selinux/test-suite-root.log ${{ steps.vars.outputs.path_GNU_tests }}/selinux-test-suite-root.log || echo "No SELinux test-suite-root.log found"
219+
cp -f ${{ steps.vars.outputs.path_GNU_tests }}-selinux/test-suite.log ${{ steps.vars.outputs.path_GNU_tests }}/selinux-test-suite.log
220+
cp -f ${{ steps.vars.outputs.path_GNU_tests }}-selinux/test-suite-root.log ${{ steps.vars.outputs.path_GNU_tests }}/selinux-test-suite-root.log
221+
cp -f ${{ steps.vars.outputs.path_GNU_tests }}-selinux/selinux-gnu-full-result.json ${{ steps.vars.outputs.path_GNU_tests }}/
216222
217223
- name: Run GNU tests
218224
shell: bash
@@ -228,10 +234,9 @@ jobs:
228234
path_GNU='${{ steps.vars.outputs.path_GNU }}'
229235
path_UUTILS='${{ steps.vars.outputs.path_UUTILS }}'
230236
bash "${path_UUTILS}/util/run-gnu-test.sh" run-root
231-
- name: Extract testing info into JSON
237+
- name: Extract testing info from indiv logs into JSON
232238
shell: bash
233239
run : |
234-
## Extract testing info into JSON
235240
path_UUTILS='${{ steps.vars.outputs.path_UUTILS }}'
236241
python ${path_UUTILS}/util/gnu-json-result.py ${{ steps.vars.outputs.path_GNU_tests }} > ${{ steps.vars.outputs.TEST_FULL_SUMMARY_FILE }}
237242
- name: Extract/summarize testing info

0 commit comments

Comments
 (0)