diff --git a/.github/workflows/tests-integration-reusable.yml b/.github/workflows/tests-integration-reusable.yml index a6c984eb7f..e8a13fa10f 100644 --- a/.github/workflows/tests-integration-reusable.yml +++ b/.github/workflows/tests-integration-reusable.yml @@ -28,6 +28,9 @@ on: pool-namespace: type: string default: 'tas-devex' + is-pr: + type: boolean + default: true jobs: run-integration-tests: @@ -38,7 +41,7 @@ jobs: container: us-west2-docker.pkg.dev/shepherd-268822/shepherd2/concourse-resource:latest steps: - uses: LouisBrunner/checks-action@v2.0.0 - if: always() + if: always() && inputs.is-pr id: check with: token: ${{ secrets.GITHUB_TOKEN }} @@ -272,7 +275,7 @@ jobs: shepherd delete lease ${{ steps.claim-env.outputs.lease-id }} --namespace tas-devex - uses: LouisBrunner/checks-action@v2.0.0 - if: always() + if: always() && inputs.is-pr with: token: ${{ secrets.GITHUB_TOKEN }} check_id: ${{ steps.check.outputs.check_id }} diff --git a/.github/workflows/tests-integration.yml b/.github/workflows/tests-integration.yml index e6663866e6..baa7a4ad2a 100644 --- a/.github/workflows/tests-integration.yml +++ b/.github/workflows/tests-integration.yml @@ -4,6 +4,17 @@ run-name: "Integration [${{ github.event.workflow_run.head_branch }}]: ${{ githu on: workflow_dispatch: + inputs: + workflow: + description: Tests to run + required: true + type: choice + options: + - run-integration-tests-cf-env + - run-integration-tests-cf-env-with-client-creds + - run-integration-tests-cf-env-with-min-capi + # - run-integration-windows + # - run-integration-windows-client-credentials workflow_run: workflows: - "Tests" @@ -13,29 +24,31 @@ on: jobs: run-integration-tests-cf-env: name: Integration tests - if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: ${{ (github.event_name == 'workflow_dispatch' && inputs.workflow == 'run-integration-tests-cf-env') || github.event.workflow_run.conclusion == 'success' }} uses: ./.github/workflows/tests-integration-reusable.yml with: capi-version: edge run-with-client-creds: false os: ubuntu-latest name: Integration + is-pr: ${{ github.event_name != 'workflow_dispatch' }} secrets: inherit run-integration-tests-cf-env-with-client-creds: name: client creds - if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: ${{ (github.event_name == 'workflow_dispatch' && inputs.workflow == 'run-integration-tests-cf-env-with-client-creds') || github.event.workflow_run.conclusion == 'success' }} uses: ./.github/workflows/tests-integration-reusable.yml with: capi-version: edge run-with-client-creds: true os: ubuntu-latest name: Integration client creds + is-pr: ${{ github.event_name != 'workflow_dispatch' }} secrets: inherit run-integration-tests-cf-env-with-min-capi: name: MIN CAPI - if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} + if: ${{ (github.event_name == 'workflow_dispatch' && inputs.workflow == 'run-integration-tests-cf-env-with-min-capi') || github.event.workflow_run.conclusion == 'success' }} uses: ./.github/workflows/tests-integration-reusable.yml with: capi-version: min @@ -43,11 +56,12 @@ jobs: os: ubuntu-latest name: Integration MIN CAPI pool-name: cfd_16_11_0 + is-pr: ${{ github.event_name != 'workflow_dispatch' }} secrets: inherit #run-integration-windows: # name: Windows - # if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} + # if: ${{ (github.event_name == 'workflow_dispatch' && inputs.workflow == 'run-integration-windows') || github.event.workflow_run.conclusion == 'success' }} # uses: ./.github/workflows/tests-integration-reusable.yml # with: # capi-version: edge @@ -58,7 +72,7 @@ jobs: #run-integration-windows-client-credentials: # name: Windows with client credentials - # if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }} + # if: ${{ (github.event_name == 'workflow_dispatch' && inputs.workflow == 'run-integration-windows-client-credentials') || github.event.workflow_run.conclusion == 'success' }} # uses: ./.github/workflows/tests-integration-reusable.yml # with: # capi-version: edge