From c4c1db1f2cf75b77df05ccd09f6b7fbcb0ef13de Mon Sep 17 00:00:00 2001 From: pyth0n1c <87383215+pyth0n1c@users.noreply.github.com> Date: Wed, 3 Nov 2021 16:30:02 -0700 Subject: [PATCH] Fixed up the pathing related to the ESCU Package. --- .github/workflows/docker-detection-testing.yml | 8 ++++---- .../detection_testing_execution.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-detection-testing.yml b/.github/workflows/docker-detection-testing.yml index d1c57204fc..3eb30e0540 100644 --- a/.github/workflows/docker-detection-testing.yml +++ b/.github/workflows/docker-detection-testing.yml @@ -83,7 +83,7 @@ jobs: - name: Upload Test Results Files uses: actions/upload-artifact@v2 with: - name: testing-results-files + name: testing-results-config path: | automated_detection_testing/ci/detection_testing_batch/apps/DA-ESS-ContentUpdate-latest.tar.gz automated_detection_testing/ci/detection_testing_batch/container_0_tests.txt @@ -111,8 +111,8 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v2 with: - name: testing-results-files - path: automated_detection_testing/ci/detection_testing_batch + name: testing-results-config + path: automated_detection_testing/ci/detection_testing_batch/prior_config - name: Install Docker run: | sudo apt update -qq @@ -142,7 +142,7 @@ jobs: cd automated_detection_testing/ci/detection_testing_batch source .venv/bin/activate #python3 detection_testing_execution.py -b ${{ steps.vars.outputs.branch }} -u 123456789 --splunkbase_username ${{ secrets.SPLUNKBASE_TESTING_USERNAME }} --splunkbase_password ${{ secrets.SPLUNKBASE_TESTING_KEY }} -m new -n2 - python3 detection_testing_execution.py -b RegistryDetectionFixes -u 123456789 --splunkbase_username ${{ secrets.SPLUNKBASE_TESTING_USERNAME }} --splunkbase_password ${{ secrets.SPLUNKBASE_TESTING_KEY }} -m selected -tff ${{ matrix.test_filename}} -n1 -e DA-ESS-ContentUpdate-latest.tar.gz + python3 detection_testing_execution.py -b RegistryDetectionFixes -u 123456789 --splunkbase_username ${{ secrets.SPLUNKBASE_TESTING_USERNAME }} --splunkbase_password ${{ secrets.SPLUNKBASE_TESTING_KEY }} -m selected -tff prior_config/${{ matrix.test_filename}} -n1 -e prior_config/apps/DA-ESS-ContentUpdate-latest.tar.gz - name: Upload Test Results Files diff --git a/automated_detection_testing/ci/detection_testing_batch/detection_testing_execution.py b/automated_detection_testing/ci/detection_testing_batch/detection_testing_execution.py index 5bb27358f1..10deb2ed9e 100644 --- a/automated_detection_testing/ci/detection_testing_batch/detection_testing_execution.py +++ b/automated_detection_testing/ci/detection_testing_batch/detection_testing_execution.py @@ -522,7 +522,7 @@ def main(args): new_name = os.path.join("security_content", leading, filename) normalized_detection_names.append(new_name) output_file.write('\n'.join(normalized_detection_names)) - print("Done", end='') + print("Done") sys.exit(0)