diff --git a/.github/workflows/deploy_tre.yml b/.github/workflows/deploy_tre.yml index 54689239a..614a068fc 100644 --- a/.github/workflows/deploy_tre.yml +++ b/.github/workflows/deploy_tre.yml @@ -32,6 +32,7 @@ jobs: ${{ (github.event_name == 'push' && 'extended or extended_aad') || 'extended or extended_aad or shared_services or airlock' }} environmentName: ${{ github.event.inputs.environment || 'CICD' }} + E2E_TESTS_NUMBER_PROCESSES: 1 secrets: AAD_TENANT_ID: ${{ secrets.AAD_TENANT_ID }} ACR_NAME: ${{ secrets.ACR_NAME }} @@ -60,4 +61,3 @@ jobs: CORE_APP_SERVICE_PLAN_SKU: ${{ secrets.CORE_APP_SERVICE_PLAN_SKU }} WORKSPACE_APP_SERVICE_PLAN_SKU: ${{ secrets.WORKSPACE_APP_SERVICE_PLAN_SKU }} RESOURCE_PROCESSOR_NUMBER_PROCESSES_PER_INSTANCE: ${{ secrets.RESOURCE_PROCESSOR_NUMBER_PROCESSES_PER_INSTANCE }} - E2E_TESTS_NUMBER_PROCESSES: "1" diff --git a/.github/workflows/deploy_tre_branch.yml b/.github/workflows/deploy_tre_branch.yml index 1b74f6984..d28d95f53 100644 --- a/.github/workflows/deploy_tre_branch.yml +++ b/.github/workflows/deploy_tre_branch.yml @@ -58,6 +58,7 @@ jobs: prHeadSha: ${{ github.sha }} e2eTestsCustomSelector: ${{ github.event.inputs.e2eTestsCustomSelector }} environmentName: ${{ github.event.inputs.environment }} + E2E_TESTS_NUMBER_PROCESSES: 1 secrets: AAD_TENANT_ID: ${{ secrets.AAD_TENANT_ID }} ACR_NAME: ${{ format('tre{0}', needs.prepare-not-main.outputs.refid) }} @@ -87,4 +88,3 @@ jobs: CORE_APP_SERVICE_PLAN_SKU: ${{ secrets.CORE_APP_SERVICE_PLAN_SKU }} WORKSPACE_APP_SERVICE_PLAN_SKU: ${{ secrets.WORKSPACE_APP_SERVICE_PLAN_SKU }} RESOURCE_PROCESSOR_NUMBER_PROCESSES_PER_INSTANCE: ${{ secrets.RESOURCE_PROCESSOR_NUMBER_PROCESSES_PER_INSTANCE }} - E2E_TESTS_NUMBER_PROCESSES: "1" diff --git a/.github/workflows/deploy_tre_reusable.yml b/.github/workflows/deploy_tre_reusable.yml index e569ae14a..5ed631701 100644 --- a/.github/workflows/deploy_tre_reusable.yml +++ b/.github/workflows/deploy_tre_reusable.yml @@ -27,6 +27,10 @@ on: # yamllint disable-line rule:truthy description: The name of the Github Action's environment this will deploy into type: string required: true + E2E_TESTS_NUMBER_PROCESSES: + description: "" + type: number + required: false secrets: AAD_TENANT_ID: description: "" @@ -112,9 +116,6 @@ on: # yamllint disable-line rule:truthy RESOURCE_PROCESSOR_NUMBER_PROCESSES_PER_INSTANCE: description: "" required: false - E2E_TESTS_NUMBER_PROCESSES: - description: "" - required: false # This will prevent multiple runs of this entire workflow. # We should NOT cancel in progress runs as that can destabilize the environment. @@ -787,7 +788,7 @@ jobs: TRE_ID: "${{ secrets.TRE_ID }}" IS_API_SECURED: false WORKSPACE_APP_SERVICE_PLAN_SKU: ${{ secrets.WORKSPACE_APP_SERVICE_PLAN_SKU }} - E2E_TESTS_NUMBER_PROCESSES: ${{ secrets.E2E_TESTS_NUMBER_PROCESSES }} + E2E_TESTS_NUMBER_PROCESSES: ${{ inputs.E2E_TESTS_NUMBER_PROCESSES }} - name: Upload Test Results if: always() diff --git a/.github/workflows/pr_comment_bot.yml b/.github/workflows/pr_comment_bot.yml index 9698084c5..d45f22a21 100644 --- a/.github/workflows/pr_comment_bot.yml +++ b/.github/workflows/pr_comment_bot.yml @@ -150,6 +150,7 @@ jobs: (needs.pr_comment.outputs.command == 'run-tests-shared-services' && 'shared_services') || (needs.pr_comment.outputs.command == 'run-tests' && '') }} environmentName: CICD + E2E_TESTS_NUMBER_PROCESSES: 1 secrets: AAD_TENANT_ID: ${{ secrets.AAD_TENANT_ID }} ACR_NAME: ${{ format('tre{0}', needs.pr_comment.outputs.prRefId) }} @@ -176,4 +177,3 @@ jobs: TRE_ID: ${{ format('tre{0}', needs.pr_comment.outputs.prRefId) }} CI_CACHE_ACR_NAME: ${{ secrets.ACR_NAME }} TF_LOG: ${{ secrets.TF_LOG }} - E2E_TESTS_NUMBER_PROCESSES: "1"