From 24a783b5fb17656e4f410f3101a1e637e35dea56 Mon Sep 17 00:00:00 2001 From: James Talton Date: Mon, 26 Aug 2024 13:19:58 -0400 Subject: [PATCH] AWX E2E Support MAX_PARALLEL Signed-off-by: James Talton --- .github/workflows/awx-e2e.yml | 7 ++++++- .github/workflows/awx-update-server.yml | 9 +++++++++ .github/workflows/pull-request.yml | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/awx-e2e.yml b/.github/workflows/awx-e2e.yml index 4d24c4a991..551bd7f7fc 100644 --- a/.github/workflows/awx-e2e.yml +++ b/.github/workflows/awx-e2e.yml @@ -13,6 +13,11 @@ on: TAGS: type: string required: false + MAX_PARALLEL: + type: number + required: true + default: 100 + description: 'Maximum parallel jobs' secrets: AWX_PASSWORD: required: true @@ -94,7 +99,7 @@ jobs: - awx-ui-image - generate-matrix strategy: - # max-parallel: 8 + max-parallel: ${{ inputs.MAX_PARALLEL }} fail-fast: false matrix: containers: ${{ contains(github.event.pull_request.labels.*.name, 'dashboard') && fromJson('[1,2,3,4]') || fromJson(needs.generate-matrix.outputs.MATRIX) }} diff --git a/.github/workflows/awx-update-server.yml b/.github/workflows/awx-update-server.yml index 2cdf9ebd75..124da0aaaf 100644 --- a/.github/workflows/awx-update-server.yml +++ b/.github/workflows/awx-update-server.yml @@ -11,6 +11,11 @@ on: required: true default: false description: 'Update server on success' + MAX_PARALLEL: + type: number + required: true + default: 100 + description: 'Maximum parallel jobs' schedule: - cron: '0 8 * * *' @@ -21,6 +26,7 @@ jobs: outputs: AWX_SERVER: ${{ steps.step1.outputs.AWX_SERVER }} UPDATE_SERVER: ${{ steps.step1.outputs.UPDATE_SERVER }} + MAX_PARALLEL: ${{ steps.step1.outputs.MAX_PARALLEL }} steps: - id: step1 run: | @@ -28,9 +34,11 @@ jobs: if([ "${{ github.event_name }}" == "workflow_dispatch" ]); then echo "AWX_SERVER=${{ github.event.inputs.AWX_SERVER || 'https://awx.ci-ui-${CURRENTDATE}.gcp.testing.ansible.com' }}" >> "$GITHUB_OUTPUT" echo "UPDATE_SERVER=${{ github.event.inputs.UPDATE_SERVER }}" >> "$GITHUB_OUTPUT" + echo "MAX_PARALLEL=${{ github.event.inputs.MAX_PARALLEL }}" >> "$GITHUB_OUTPUT" else echo "AWX_SERVER=https://awx.ci-ui-${CURRENTDATE}.gcp.testing.ansible.com" >> "$GITHUB_OUTPUT" echo "UPDATE_SERVER=true" >> "$GITHUB_OUTPUT" + echo "MAX_PARALLEL=100" >> "$GITHUB_OUTPUT" fi awx-e2e: @@ -43,6 +51,7 @@ jobs: AWX_PASSWORD: ${{ secrets.AWX_PASSWORD }} AWX_PROJECT_ID: ${{ secrets.AWX_PROJECT_ID }} AWX_RECORD_KEY: ${{ secrets.AWX_RECORD_KEY }} + MAX_PARALLEL: ${{ needs.setup.outputs.MAX_PARALLEL }} awx-update-server: name: AWX Update Server diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index fda27d953a..b44e2263e1 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -108,6 +108,7 @@ jobs: with: AWX_SERVER: ${{ vars.AWX_SERVER }} SKIP_JOB: ${{ needs.packages.outputs.awx != 'true' }} + MAX_PARALLEL: 100 secrets: AWX_PASSWORD: ${{ secrets.AWX_PASSWORD }} AWX_PROJECT_ID: ${{ secrets.AWX_PROJECT_ID }}