From 3cd3ca6692df66bf68e39a5cc561730a0dc1cb3f Mon Sep 17 00:00:00 2001 From: pyth0n1c <87383215+pyth0n1c@users.noreply.github.com> Date: Wed, 24 Nov 2021 09:54:27 -0800 Subject: [PATCH] Another CI change to list directory structure during summarize step. --- .github/workflows/docker-detection-testing.yml | 3 ++- .../ci/detection_testing_batch/summarize_json.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-detection-testing.yml b/.github/workflows/docker-detection-testing.yml index e704469387..6a8a5b929e 100644 --- a/.github/workflows/docker-detection-testing.yml +++ b/.github/workflows/docker-detection-testing.yml @@ -77,7 +77,7 @@ jobs: cd automated_detection_testing/ci/detection_testing_batch source .venv/bin/activate - python3 detection_testing_execution.py run --branch develop --mode all --num_containers 10 --mock + python3 detection_testing_execution.py run --branch develop --mode changes --num_containers 10 --mock - name: Upload Test Results Files uses: actions/upload-artifact@v2 @@ -243,6 +243,7 @@ jobs: - name: Merge Detections into single File run: | cd automated_detection_testing/ci/detection_testing_batch + ls -lah python summarize_json.py --files results_*/combined.json --output_filename summary_test_results.json diff --git a/automated_detection_testing/ci/detection_testing_batch/summarize_json.py b/automated_detection_testing/ci/detection_testing_batch/summarize_json.py index 6cc49684bc..38ddb61a16 100644 --- a/automated_detection_testing/ci/detection_testing_batch/summarize_json.py +++ b/automated_detection_testing/ci/detection_testing_batch/summarize_json.py @@ -40,7 +40,7 @@ def outputResultsJSON(output_filename:str, data:list[dict], baseline:OrderedDict "FAIL_AND_ERROR":fail_and_error_count } with open(output_filename, "w") as jsonFile: - json.dump({'summary':summary, 'baseline': baseline, 'results':data}, jsonFile, indent=" ") + json.dump({'summary':summary, 'baseline': baseline, 'results':data}, jsonFile, indent=" ") except Exception as e: print("There was an error generating [%s]: [%s]"%(output_filename, str(e)),file=sys.stderr) raise(e)