From 22656ffe23460649495c1dff588d2441fa4c186a Mon Sep 17 00:00:00 2001
From: pyth0n1c <87383215+pyth0n1c@users.noreply.github.com>
Date: Fri, 5 Nov 2021 14:57:46 -0700
Subject: [PATCH] typo in NEEDS for test script.

---
 .../workflows/docker-detection-testing.yml    | 90 ++++++++++++++++++-
 1 file changed, 87 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-detection-testing.yml b/.github/workflows/docker-detection-testing.yml
index 5898369c64..ae9cf277a4 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 -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 all -n5 -split
+              python3 detection_testing_execution.py -b RegistryDetectionFixes -u 123456789 --splunkbase_username ${{ secrets.SPLUNKBASE_TESTING_USERNAME }} --splunkbase_password ${{ secrets.SPLUNKBASE_TESTING_KEY }} -m new -n10 -split
               echo "DONE!"
           
           - name: Upload Test Results Files
@@ -91,6 +91,11 @@ jobs:
                 automated_detection_testing/ci/detection_testing_batch/container_2_tests.txt
                 automated_detection_testing/ci/detection_testing_batch/container_3_tests.txt
                 automated_detection_testing/ci/detection_testing_batch/container_4_tests.txt
+                automated_detection_testing/ci/detection_testing_batch/container_5_tests.txt
+                automated_detection_testing/ci/detection_testing_batch/container_6_tests.txt
+                automated_detection_testing/ci/detection_testing_batch/container_7_tests.txt
+                automated_detection_testing/ci/detection_testing_batch/container_8_tests.txt
+                automated_detection_testing/ci/detection_testing_batch/container_9_tests.txt
 
 
   docker-detection-testing-execution:
@@ -98,7 +103,16 @@ jobs:
     needs: [validate-tag-if-present, quit-for-dependabot, docker-detection-testing-setup]
     strategy:
       matrix:
-        test_filename: ["container_0_tests.txt", "container_1_tests.txt", "container_2_tests.txt", "container_3_tests.txt", "container_4_tests.txt"]
+        test_filename: ["container_0_tests.txt", 
+                        "container_1_tests.txt", 
+                        "container_2_tests.txt", 
+                        "container_3_tests.txt", 
+                        "container_4_tests.txt", 
+                        "container_5_tests.txt", 
+                        "container_6_tests.txt", 
+                        "container_7_tests.txt", 
+                        "container_8_tests.txt", 
+                        "container_9_tests.txt"]
     steps:  
         - name: Get branch and PR required for detection testing main.py
           id: vars
@@ -158,4 +172,74 @@ jobs:
               automated_detection_testing/ci/detection_testing_batch/error.json
               automated_detection_testing/ci/detection_testing_batch/failure.json
               automated_detection_testing/ci/detection_testing_batch/combined.json
-              
\ No newline at end of file
+          
+  docker-detection-testing-execution-merge-results:
+    runs-on: ubuntu-latest
+    needs: [validate-tag-if-present, quit-for-dependabot, docker-detection-testing-setup, docker-detection-testing-execution]
+ 
+    steps:  
+        - name: Get branch and PR required for detection testing main.py
+          id: vars
+          run: |
+            echo "::set-output name=branch::${GITHUB_REF#refs/heads/}"
+
+        - name: Checkout Repo
+          uses: actions/checkout@v2
+        
+        - name: Download artifacts
+          uses: actions/download-artifact@v2
+          with:
+            name: container_0_tests.txt.results
+            path: automated_detection_testing/ci/detection_testing_batch/results
+        - name: Download artifacts
+          uses: actions/download-artifact@v2
+          with:
+            name: container_1_tests.txt.results
+            path: automated_detection_testing/ci/detection_testing_batch/results
+        - name: Download artifacts
+          uses: actions/download-artifact@v2
+          with:
+            name: container_2_tests.txt.results
+            path: automated_detection_testing/ci/detection_testing_batch/results
+        - name: Download artifacts
+          uses: actions/download-artifact@v2
+          with:
+            name: container_3_tests.txt.results
+            path: automated_detection_testing/ci/detection_testing_batch/results
+        - name: Download artifacts
+          uses: actions/download-artifact@v2
+          with:
+            name: container_4_tests.txt.results
+            path: automated_detection_testing/ci/detection_testing_batch/results
+        - name: Download artifacts
+          uses: actions/download-artifact@v2
+          with:
+            name: container_5_tests.txt.results
+            path: automated_detection_testing/ci/detection_testing_batch/results
+        - name: Download artifacts
+          uses: actions/download-artifact@v2
+          with:
+            name: container_6_tests.txt.results
+            path: automated_detection_testing/ci/detection_testing_batch/results
+        - name: Download artifacts
+          uses: actions/download-artifact@v2
+          with:
+            name: container_7_tests.txt.results
+            path: automated_detection_testing/ci/detection_testing_batch/results
+        - name: Download artifacts
+          uses: actions/download-artifact@v2
+          with:
+            name: container_8_tests.txt.results
+            path: automated_detection_testing/ci/detection_testing_batch/results
+        - name: Download artifacts
+          uses: actions/download-artifact@v2
+          with:
+            name: container_9_tests.txt.results
+            path: automated_detection_testing/ci/detection_testing_batch/results
+        
+        - name: Merge Detections into single File
+          run: |
+            cd automated_detection_testing/ci/detection_testing_batch/results
+            ls -lah
+            echo "DONE!"
+