From 5f972f734feeef6832d2cff0776cdc491aa90e7c Mon Sep 17 00:00:00 2001 From: pyth0n1c <87383215+pyth0n1c@users.noreply.github.com> Date: Tue, 21 Dec 2021 11:00:11 -0800 Subject: [PATCH] Re-push to test everything with 2 containers per GH Actions machine. --- .github/workflows/build-and-validate.yml | 2 +- .../ci/detection_testing_batch/detection_testing_execution.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-validate.yml b/.github/workflows/build-and-validate.yml index c6ed4e4db5..5cddd0389e 100644 --- a/.github/workflows/build-and-validate.yml +++ b/.github/workflows/build-and-validate.yml @@ -355,7 +355,7 @@ jobs: python detection_testing_execution.py run --branch ${{ github.event.pull_request.head.ref }} --mode all --mock --config_file test_config_github_actions.json elif [[ ! -z "${{ github.event.pull_request.head.ref }}" && ! -z "${{ github.event.pull_request.number }}" ]]; then echo "Pull request from source branch [${{ github.event.pull_request.head.ref }}] for PR number [${{ github.event.issue.number }}]" - python detection_testing_execution.py run --branch ${{ github.event.pull_request.head.ref }} --pr_number ${{ github.event.pull_request.number }} --mode changes --mock --config_file test_config_github_actions.json + python detection_testing_execution.py run --branch ${{ github.event.pull_request.head.ref }} --pr_number ${{ github.event.pull_request.number }} --mode all --mock --config_file test_config_github_actions.json else echo "Push from branch [${{ steps.vars.outputs.branch }}]" python detection_testing_execution.py run --branch ${{ steps.vars.outputs.branch }} --mode changes --mock --config_file test_config_github_actions.json diff --git a/bin/automated_detection_testing/ci/detection_testing_batch/detection_testing_execution.py b/bin/automated_detection_testing/ci/detection_testing_batch/detection_testing_execution.py index 235417869d..c8f5557eec 100644 --- a/bin/automated_detection_testing/ci/detection_testing_batch/detection_testing_execution.py +++ b/bin/automated_detection_testing/ci/detection_testing_batch/detection_testing_execution.py @@ -264,7 +264,7 @@ def finish_mock(settings: dict, detections: list[str], output_file_template: str mock_settings = copy.deepcopy(settings) # This may be able to support as many as 2 for GitHub Actions... # we will have to determine in testing. - mock_settings['num_containers'] = 1 + mock_settings['num_containers'] = 2 # Must be selected since we are passing in a list of detections mock_settings['mode'] = 'selected'