diff --git a/.github/workflows/windows-e2e.yml b/.github/workflows/windows-e2e.yml index cba2e2ecfd..9b731447fa 100644 --- a/.github/workflows/windows-e2e.yml +++ b/.github/workflows/windows-e2e.yml @@ -8,6 +8,11 @@ on: jobs: windows-e2e-ocp: + # https://docs.github.com/en/webhooks/webhook-events-and-payloads#workflow_run + if: | + github.event.workflow_run.conclusion == 'success' && + env.source_event == 'pull_request' && + github.event.workflow_run.triggering_actor != 'dependabot[bot]' uses: crc-org/crc/.github/workflows/windows-qe-tpl.yml@main strategy: fail-fast: false diff --git a/.github/workflows/windows-qe-tpl.yml b/.github/workflows/windows-qe-tpl.yml index 24f5090e78..59cdce5936 100644 --- a/.github/workflows/windows-qe-tpl.yml +++ b/.github/workflows/windows-qe-tpl.yml @@ -107,7 +107,7 @@ jobs: -e ARM_CLIENT_SECRET='${{secrets.ARM_CLIENT_SECRET}}' \ -e AZURE_STORAGE_ACCOUNT='${{ secrets.AZURE_STORAGE_ACCOUNT }}' \ -e AZURE_STORAGE_KEY='${{ secrets.AZURE_STORAGE_KEY }}' \ - quay.io/redhat-developer/mapt:v0.6.6 azure \ + quay.io/redhat-developer/mapt:v0.6.9 azure \ windows create \ --project-name 'windows-desktop-${{ matrix.windows-version }}-${{ matrix.windows-featurepack }}-${{inputs.qe-type}}-${{inputs.preset}}' \ --backed-url azblob://crc-qenvs-state/${{ github.repository }}-${{ github.run_id }} \ @@ -149,7 +149,10 @@ jobs: else cmd="${cmd} -e2eTagExpression '~@minimal && ~@story_microshift'" fi + else + cmd="${cmd} -suiteTimeout 120m" fi + podman run --rm -d --name crc-${{inputs.qe-type}} \ -e TARGET_HOST=$(cat host) \ -e TARGET_HOST_USERNAME=$(cat username) \ @@ -218,7 +221,7 @@ jobs: -e ARM_CLIENT_SECRET='${{secrets.ARM_CLIENT_SECRET}}' \ -e AZURE_STORAGE_ACCOUNT='${{ secrets.AZURE_STORAGE_ACCOUNT }}' \ -e AZURE_STORAGE_KEY='${{ secrets.AZURE_STORAGE_KEY }}' \ - quay.io/redhat-developer/mapt:v0.6.6 azure \ + quay.io/redhat-developer/mapt:v0.6.9 azure \ windows destroy \ --project-name 'windows-desktop-${{ matrix.windows-version }}-${{ matrix.windows-featurepack }}-${{inputs.qe-type}}-${{inputs.preset}}' \ --backed-url azblob://crc-qenvs-state/${{ github.repository }}-${{ github.run_id }}