From 869b6f693072103a8f139068bf6b7ede5761a64e Mon Sep 17 00:00:00 2001 From: hezijie Date: Fri, 13 Sep 2024 10:18:16 +0800 Subject: [PATCH] convert e2e to a workflow_disptach event --- .github/workflows/e2e.yaml | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 3f80f6431..414bbfdc8 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -1,22 +1,25 @@ name: E2E Test Check on: - pull_request: - types: ['opened', 'synchronize'] - paths: - - '.github/**' - - '.github/workflows/**' - - 'quickstart/**' + workflow_dispatch: + inputs: + pr_number: + description: '(Required) pull request number to test against' + type: string + required: true permissions: actions: write + contents: read + id-token: write jobs: e2e-check: - runs-on: [self-hosted, 1ES.Pool=terraform-azurerm-doc] + runs-on: ubuntu-latest environment: name: acctests steps: - name: checkout - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0 + run: + gh pr checkout ${{ inputs.query }} - name: Get changed files id: changed-files uses: tj-actions/changed-files@v34 @@ -31,15 +34,16 @@ jobs: ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }} run: | echo "change files" $ALL_CHANGED_FILES - az login --identity --username $MSI_ID > /dev/null - export ARM_SUBSCRIPTION_ID=$(az login --identity --username $MSI_ID | jq -r '.[0] | .id') - export ARM_TENANT_ID=$(az login --identity --username $MSI_ID | jq -r '.[0] | .tenantId') - ARM_CLIENT_ID=$(az identity list | jq -r --arg MSI_ID "$MSI_ID" '.[] | select(.principalId == $MSI_ID) | .clientId') + export ARM_OIDC_REQUEST_TOKEN=$ACTIONS_ID_TOKEN_REQUEST_TOKEN + export ARM_OIDC_REQUEST_URL=$ACTIONS_ID_TOKEN_REQUEST_URL + export ARM_SUBSCRIPTION_ID=${{ secrets.ARM_SUBSCRIPTION_ID }} + export ARM_TENANT_ID=${{ secrets.ARM_TENANT_ID }} + export ARM_CLIENT_ID=${{ secrets.ARM_CLIENT_ID }} export CHANGED_FOLDERS="${{ steps.changed-files.outputs.all_changed_files }}" - docker run --rm -v $(pwd):/src -w /src/test --network=host -e MSI_ID -e ARM_SUBSCRIPTION_ID -e ARM_TENANT_ID -e ARM_CLIENT_ID -e ARM_USE_MSI=true -e CHANGED_FOLDERS mcr.microsoft.com/azterraform:latest sh -c "pkenv install 1.10.2 && go mod tidy && go test -timeout=360m -v ./e2e" + docker run --rm -v $(pwd):/src -w /src/test --network=host -e MSI_ID -e ARM_SUBSCRIPTION_ID -e ARM_TENANT_ID -e ARM_CLIENT_ID -e ARM_OIDC_REQUEST_TOKEN -e ARM_OIDC_REQUEST_URL -e ARM_USE_OIDC=true -e CHANGED_FOLDERS mcr.microsoft.com/azterraform:latest sh -c "pkenv install 1.10.2 && go mod tidy && go test -timeout=360m -v ./e2e" - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 #v3.1.3 with: - name: TestRecord-${{ github.event.number }} + name: TestRecord-${{ inputs.query }} retention-days: 60 path: | quickstart/**/TestRecord.md.tmp \ No newline at end of file