From 64d803c453ed5465f1b765a3d1a332d2105ff17f Mon Sep 17 00:00:00 2001 From: Steve Hipwell Date: Mon, 25 Nov 2024 17:18:06 +0000 Subject: [PATCH] feat: Refactored acceptance test automation Signed-off-by: Steve Hipwell --- .../workflows/dotcom-acceptance-tests-all.yml | 97 --------------- .../dotcom-acceptance-tests-manual.yml | 115 ------------------ .github/workflows/dotcom-acceptance-tests.yml | 80 +++++------- .../workflows/ghes-acceptance-tests-all.yml | 112 ----------------- .github/workflows/ghes-acceptance-tests.yml | 108 +++++++--------- GNUmakefile | 2 +- 6 files changed, 76 insertions(+), 438 deletions(-) delete mode 100644 .github/workflows/dotcom-acceptance-tests-all.yml delete mode 100644 .github/workflows/dotcom-acceptance-tests-manual.yml delete mode 100644 .github/workflows/ghes-acceptance-tests-all.yml diff --git a/.github/workflows/dotcom-acceptance-tests-all.yml b/.github/workflows/dotcom-acceptance-tests-all.yml deleted file mode 100644 index 3d9c35918c..0000000000 --- a/.github/workflows/dotcom-acceptance-tests-all.yml +++ /dev/null @@ -1,97 +0,0 @@ -name: Dotcom Acceptance Tests (All) - -on: - schedule: - # ┌───────────── minute (0 - 59) - # │ ┌───────────── hour (0 - 23) - # │ │ ┌───────────── day of the month (1 - 31) - # │ │ │ ┌───────────── month (1 - 12 or JAN-DEC) - # │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT) - # * * * * * - - cron: '0 0 * * 3' - -jobs: - - acceptance-tests-anonymous: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ github.event.pull_request.head.ref }} - fetch-depth: 2 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 - with: - go-version-file: 'go.mod' - cache: true - - name: Acceptance Tests (Anonymous) - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - TF_LOG: INFO - RUN_ALL: true - - acceptance-tests-individual: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ github.event.pull_request.head.ref }} - fetch-depth: 2 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 - with: - go-version-file: 'go.mod' - cache: true - - - name: Acceptance Tests (Individual) - id: acceptance-tests-individual - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - TF_LOG: INFO - RUN_ALL: true - GITHUB_OWNER: github-terraform-test-user - GITHUB_TEST_USER_TOKEN: ${{ secrets.DOTCOM_TEST_USER_TOKEN }} - GITHUB_TEST_ORGANIZATION: terraformtesting - - - name: Failed Acceptance Tests (Individual) - if: ${{ failure() }} - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - TF_LOG: DEBUG - RUN_ALLOWED: ${{ steps.acceptance-tests-individual.outputs.failed }} - GITHUB_OWNER: github-terraform-test-user - GITHUB_TEST_USER_TOKEN: ${{ secrets.DOTCOM_TEST_USER_TOKEN }} - GITHUB_TEST_ORGANIZATION: terraformtesting - - acceptance-tests-organization: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ github.event.pull_request.head.ref }} - fetch-depth: 2 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 - with: - go-version-file: 'go.mod' - cache: true - - - name: Acceptance Tests (Organization) - id: acceptance-tests-organization - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - TF_LOG: INFO - RUN_ALL: true - GITHUB_ORGANIZATION: terraformtesting - GITHUB_TEST_USER_TOKEN: ${{ secrets.DOTCOM_TEST_USER_TOKEN }} - GITHUB_TEST_OWNER: github-terraform-test-user - - - name: Failed Acceptance Tests (Organization) - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - if: ${{ failure() }} - with: - TF_LOG: DEBUG - RUN_ALLOWED: ${{ steps.acceptance-tests-organization.outputs.failed }} - GITHUB_ORGANIZATION: terraformtesting - GITHUB_TEST_USER_TOKEN: ${{ secrets.DOTCOM_TEST_USER_TOKEN }} - GITHUB_TEST_OWNER: github-terraform-test-user diff --git a/.github/workflows/dotcom-acceptance-tests-manual.yml b/.github/workflows/dotcom-acceptance-tests-manual.yml deleted file mode 100644 index d607d9cd3a..0000000000 --- a/.github/workflows/dotcom-acceptance-tests-manual.yml +++ /dev/null @@ -1,115 +0,0 @@ -name: Dotcom Acceptance Tests (manual) - -on: - pull_request: - types: [labeled] - -jobs: - - acceptance-tests-anonymous: - runs-on: ubuntu-latest - if: contains(join(github.event.pull_request.labels.*.name, ', '), 'test/') - steps: - - name: Parse Args - id: args - run: | - echo "::set-output name=run_allowed::$( - jq -rc .label.name $GITHUB_EVENT_PATH | cut -d/ -f 2 - )" - - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ github.event.pull_request.head.sha }} - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 - with: - go-version-file: 'go.mod' - cache: true - - name: Acceptance Tests (Anonymous) - id: acceptance-tests-anonymous - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - TF_LOG: INFO - RUN_ALLOWED: ${{ steps.args.outputs.run_allowed }} - - name: Failed Acceptance Tests (Anonymous) - if: ${{ failure() }} - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - TF_LOG: DEBUG - RUN_ALLOWED: ${{ steps.acceptance-tests-anonymous.outputs.run_allowed }} - - - acceptance-tests-individual: - runs-on: ubuntu-latest - if: contains(join(github.event.pull_request.labels.*.name, ', '), 'test') - steps: - - name: Parse Args - id: args - run: | - echo "::set-output name=run_allowed::$( - jq -rc .label.name $GITHUB_EVENT_PATH | cut -d/ -f 2 - )" - - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ github.event.pull_request.head.sha }} - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 - with: - go-version-file: 'go.mod' - cache: true - - name: Acceptance Tests (Individual) - id: acceptance-tests-individual - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - TF_LOG: INFO - RUN_ALLOWED: ${{ steps.args.outputs.run_allowed }} - GITHUB_OWNER: github-terraform-test-user - GITHUB_TEST_USER_TOKEN: ${{ secrets.DOTCOM_TEST_USER_TOKEN }} - GITHUB_TEST_ORGANIZATION: terraformtesting - - name: Failed Acceptance Tests (Individual) - if: ${{ failure() }} - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - TF_LOG: DEBUG - RUN_ALLOWED: ${{ steps.args.outputs.run_allowed }} - GITHUB_OWNER: github-terraform-test-user - GITHUB_TEST_USER_TOKEN: ${{ secrets.DOTCOM_TEST_USER_TOKEN }} - GITHUB_TEST_ORGANIZATION: terraformtesting - - acceptance-tests-organization: - runs-on: ubuntu-latest - if: contains(join(github.event.pull_request.labels.*.name, ', '), 'test') - steps: - - name: Parse Args - id: args - run: | - echo "::set-output name=run_allowed::$( - jq -rc .label.name $GITHUB_EVENT_PATH | cut -d/ -f 2 - )" - - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ github.event.pull_request.head.sha }} - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 - with: - go-version-file: 'go.mod' - cache: true - - - name: Acceptance Tests (Organization) - id: acceptance-tests-organization - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - TF_LOG: INFO - RUN_ALLOWED: ${{ steps.args.outputs.run_allowed }} - GITHUB_ORGANIZATION: terraformtesting - GITHUB_TEST_USER_TOKEN: ${{ secrets.DOTCOM_TEST_USER_TOKEN }} - GITHUB_TEST_OWNER: github-terraform-test-user - - - name: Failed Acceptance Tests (Organization) - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - if: ${{ failure() }} - with: - TF_LOG: DEBUG - RUN_ALLOWED: ${{ steps.args.outputs.run_allowed }} - GITHUB_ORGANIZATION: terraformtesting - GITHUB_TEST_USER_TOKEN: ${{ secrets.DOTCOM_TEST_USER_TOKEN }} - GITHUB_TEST_OWNER: github-terraform-test-user diff --git a/.github/workflows/dotcom-acceptance-tests.yml b/.github/workflows/dotcom-acceptance-tests.yml index 28aa777c42..524a0c4c38 100644 --- a/.github/workflows/dotcom-acceptance-tests.yml +++ b/.github/workflows/dotcom-acceptance-tests.yml @@ -1,61 +1,47 @@ -name: Dotcom Acceptance Tests +name: Acceptance Tests (github.com) on: - push: + workflow_dispatch: + pull_request: + types: + - opened + - synchronize + - reopened branches: - - test/** + - main -jobs: +permissions: read-all - acceptance-tests-anonymous: +jobs: + test: + name: Test ${{ matrix.type }} + # if: contains(github.event.pull_request.labels.*.name, 'test') runs-on: ubuntu-latest + permissions: + contents: read + defaults: + run: + shell: bash + strategy: + matrix: + type: [anonymous, individual, organization] + fail-fast: false steps: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ github.event.pull_request.head.ref }} - fetch-depth: 2 - - name: Acceptance Tests (Anonymous) - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - TF_LOG: INFO - acceptance-tests-individual: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ github.event.pull_request.head.ref }} - fetch-depth: 2 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 + - name: Set up Go + uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: - go-version-file: 'go.mod' + go-version-file: go.mod cache: true - - name: Acceptance Tests (Individual) - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - TF_LOG: INFO - GITHUB_OWNER: github-terraform-test-user - GITHUB_TEST_USER_TOKEN: ${{ secrets.DOTCOM_TEST_USER_TOKEN }} - GITHUB_TEST_ORGANIZATION: terraformtesting - acceptance-tests-organization: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ github.event.pull_request.head.ref }} - fetch-depth: 2 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 - with: - go-version-file: 'go.mod' - cache: true - - name: Acceptance Tests (Organization) - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: + - name: Run tests + env: TF_LOG: INFO - GITHUB_ORGANIZATION: terraformtesting - GITHUB_TEST_USER_TOKEN: ${{ secrets.DOTCOM_TEST_USER_TOKEN }} - GITHUB_TEST_OWNER: github-terraform-test-user + GITHUB_OWNER: ${{ matrix.type == 'individual' && 'github-terraform-test-user' || '' }} + GITHUB_TEST_ORGANIZATION: ${{ matrix.type == 'individual' && 'terraformtesting' || '' }} + GITHUB_ORGANIZATION: ${{ matrix.type == 'organization' && 'terraformtesting' || '' }} + GITHUB_TEST_OWNER: ${{ matrix.type == 'organization' && 'github-terraform-test-user' || '' }} + GITHUB_TEST_USER_TOKEN: ${{ (matrix.type == 'individual' || matrix.type == 'organization') && secrets.DOTCOM_TEST_USER_TOKEN || '' }} + run: make testacc diff --git a/.github/workflows/ghes-acceptance-tests-all.yml b/.github/workflows/ghes-acceptance-tests-all.yml deleted file mode 100644 index 78d064ba82..0000000000 --- a/.github/workflows/ghes-acceptance-tests-all.yml +++ /dev/null @@ -1,112 +0,0 @@ -name: GHES Acceptance Tests (All) - -on: - schedule: - # ┌───────────── minute (0 - 59) - # │ ┌───────────── hour (0 - 23) - # │ │ ┌───────────── day of the month (1 - 31) - # │ │ │ ┌───────────── month (1 - 12 or JAN-DEC) - # │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT) - # * * * * * - - cron: '0 0 * * 3' - -jobs: - runtime: - runs-on: ubuntu-latest - steps: - - name: Query server address - id: server-address - run: | - SERVER_ADDRESS=$(dig +short terraformtesting-ghe.eastus.cloudapp.azure.com) - echo "::set-output name=server-address::${SERVER_ADDRESS}" - outputs: - server-address: ${{ steps.server-address.outputs.server-address }} - - acceptance-tests-anonymous: - needs: [runtime] - if: ${{ needs.runtime.outputs.server-address != '255.255.255.255' }} - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ github.event.pull_request.head.ref }} - fetch-depth: 2 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 - with: - go-version-file: 'go.mod' - cache: true - - name: Acceptance Tests (Anonymous) - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - GITHUB_BASE_URL: "https://terraformtesting-ghe.eastus.cloudapp.azure.com/" - - acceptance-tests-individual: - needs: [runtime] - if: ${{ needs.runtime.outputs.server-address != '255.255.255.255' }} - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ github.event.pull_request.head.ref }} - fetch-depth: 2 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 - with: - go-version-file: 'go.mod' - cache: true - - - name: Acceptance Tests (Individual) - id: acceptance-tests-individual - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - TF_LOG: INFO - RUN_ALL: true - GITHUB_BASE_URL: "https://terraformtesting-ghe.eastus.cloudapp.azure.com/" - GITHUB_OWNER: administrator - GITHUB_TEST_USER_TOKEN: ${{ secrets.GHES_TEST_USER_TOKEN }} - - - name: Failed Acceptance Tests (Individual) - if: ${{ failure() }} - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - TF_LOG: DEBUG - RUN_ALLOWED: ${{ steps.acceptance-tests-individual.outputs.failed }} - GITHUB_BASE_URL: "https://terraformtesting-ghe.eastus.cloudapp.azure.com/" - GITHUB_OWNER: administrator - GITHUB_TEST_USER_TOKEN: ${{ secrets.GHES_TEST_USER_TOKEN }} - - acceptance-tests-organization: - needs: [runtime] - if: ${{ needs.runtime.outputs.server-address != '255.255.255.255' }} - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ github.event.pull_request.head.ref }} - fetch-depth: 2 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 - with: - go-version-file: 'go.mod' - cache: true - - - name: Acceptance Tests (Organization) - id: acceptance-tests-organization - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - TF_LOG: INFO - RUN_ALL: true - GITHUB_BASE_URL: "https://terraformtesting-ghe.eastus.cloudapp.azure.com/" - GITHUB_ORGANIZATION: terraformtesting - GITHUB_TEST_USER_TOKEN: ${{ secrets.GHES_TEST_USER_TOKEN }} - - - name: Failed Acceptance Tests (Organization) - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - if: ${{ failure() }} - with: - TF_LOG: DEBUG - RUN_ALLOWED: ${{ steps.acceptance-tests-organization.outputs.failed }} - GITHUB_BASE_URL: "https://terraformtesting-ghe.eastus.cloudapp.azure.com/" - GITHUB_ORGANIZATION: terraformtesting - GITHUB_TEST_USER_TOKEN: ${{ secrets.GHES_TEST_USER_TOKEN }} diff --git a/.github/workflows/ghes-acceptance-tests.yml b/.github/workflows/ghes-acceptance-tests.yml index 78318088b4..d9acd055d1 100644 --- a/.github/workflows/ghes-acceptance-tests.yml +++ b/.github/workflows/ghes-acceptance-tests.yml @@ -1,79 +1,55 @@ -name: GHES Acceptance Tests +name: Acceptance Tests (GHES) on: - push: + workflow_dispatch: + pull_request: + types: + - opened + - synchronize + - reopened branches: - - test/** + - main -jobs: - runtime: - runs-on: ubuntu-latest - steps: - - name: Query server address - id: server-address - run: | - SERVER_ADDRESS=$(dig +short terraformtesting-ghe.eastus.cloudapp.azure.com) - echo "::set-output name=server-address::${SERVER_ADDRESS}" - outputs: - server-address: ${{ steps.server-address.outputs.server-address }} +permissions: read-all - acceptance-tests-anonymous: - needs: [runtime] - if: ${{ needs.runtime.outputs.server-address != '255.255.255.255' }} +jobs: + test: + name: Test ${{ matrix.type }} + # if: contains(github.event.pull_request.labels.*.name, 'test') runs-on: ubuntu-latest + permissions: + contents: read + defaults: + run: + shell: bash + strategy: + matrix: + type: [anonymous, individual, organization] + fail-fast: false steps: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ github.event.pull_request.head.ref }} - fetch-depth: 2 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 - with: - go-version-file: 'go.mod' - cache: true - - name: Acceptance Tests (Anonymous) - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - GITHUB_BASE_URL: "https://terraformtesting-ghe.eastus.cloudapp.azure.com/" - acceptance-tests-individual: - needs: [runtime] - if: ${{ needs.runtime.outputs.server-address != '255.255.255.255' }} - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - name: Set up Go + uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: - ref: ${{ github.event.pull_request.head.ref }} - fetch-depth: 2 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 - with: - go-version-file: 'go.mod' + go-version-file: go.mod cache: true - - name: Acceptance Tests (Individual) - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - GITHUB_BASE_URL: "https://terraformtesting-ghe.eastus.cloudapp.azure.com/" - GITHUB_OWNER: administrator - GITHUB_TEST_USER_TOKEN: ${{ secrets.GHES_TEST_USER_TOKEN }} - acceptance-tests-organization: - needs: [runtime] - if: ${{ needs.runtime.outputs.server-address != '255.255.255.255' }} - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ github.event.pull_request.head.ref }} - fetch-depth: 2 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 - with: - go-version-file: 'go.mod' - cache: true - - name: Acceptance Tests (Organization) - uses: terraformtesting/acceptance-tests@66f4842d934555dde0f59bf1a00abd0fc710ece4 # v2.2.0 - with: - GITHUB_BASE_URL: "https://terraformtesting-ghe.eastus.cloudapp.azure.com/" - GITHUB_ORGANIZATION: terraformtesting - GITHUB_TEST_USER_TOKEN: ${{ secrets.GHES_TEST_USER_TOKEN }} + - name: Check server address + run: | + address="$(dig +short terraformtesting-ghe.eastus.cloudapp.azure.com)" + + if [[ "${address}" == ""]]; then + echo "Invalid server address" >&2 + exit 1 + fi + + - name: Run tests + env: + TF_LOG: INFO + GITHUB_BASE_URL: https://terraformtesting-ghe.eastus.cloudapp.azure.com/ + GITHUB_OWNER: ${{ matrix.type == 'individual' && 'administrator' || '' }} + GITHUB_ORGANIZATION: ${{ matrix.type == 'organization' && 'terraformtesting' || '' }} + GITHUB_TEST_USER_TOKEN: ${{ (matrix.type == 'individual' || matrix.type == 'organization') && secrets.GHES_TEST_USER_TOKEN || '' }} + run: make testacc diff --git a/GNUmakefile b/GNUmakefile index 3ad7c52274..e71220cd1c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -27,7 +27,7 @@ test: go test ./... # commenting this out for release tooling, please run testacc instead -testacc: fmtcheck +testacc: TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m test-compile: