Split test and acceptance tests into different paths

Author: akwirick

.github/workflows/main-test.yml

@@ -0,0 +1,47 @@
+# Runs acceptance tests on merge to main
+name: Acceptance Tests
+
+on:
+  push:
+    branches:
+      - "main"
+      - "akwirick/fix-testing-requirements" # TODO remove post-verification
+    paths-ignore:
+      - "README.md"
+      - "CHANGELOG.md"
+      - "TODO.md"
+
+permissions:
+  contents: read
+
+
+jobs:
+  build-and-test:
+    uses: ./.github/workflows/test.yml
+  acceptance-test:
+    name: Terraform Provider Acceptance Tests
+    needs: build-and-test
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    strategy:
+      fail-fast: false
+      matrix:
+        # list whatever Terraform versions here you would like to support
+        terraform:
+          - "1.10.*"
+    steps:
+      - uses: actions/[email protected]
+      - uses: actions/[email protected]
+        with:
+          go-version-file: "go.mod"
+          cache: true
+      - uses: hashicorp/[email protected]
+        with:
+          terraform_version: ${{ matrix.terraform }}
+          terraform_wrapper: false
+      - run: go mod download
+      - name: Acceptance tests
+        env:
+          TF_ACC: "1"
+          CORTEX_API_TOKEN: ${{ secrets.CORTEX_API_TOKEN }}
+        run: make testacc

.github/workflows/test.yml

@@ -5,13 +5,6 @@ name: Tests
 # Optionally, you can turn it on using a schedule for regular testing.
 on:
   pull_request:
-  push:
-    branches:
-      - "main"
-    paths-ignore:
-      - "README.md"
-      - "CHANGELOG.md"
-      - "TODO.md"
 
 # Testing only needs permissions to read the repository contents.
 permissions:
@@ -50,7 +43,7 @@ jobs:
           cache: true
       - uses: hashicorp/[email protected]
         with:
-          terraform_version: ${{ matrix.terraform }}
+          terraform_version: "1.10.*"
           terraform_wrapper: false
       - run: go generate ./...
       - name: git diff
@@ -60,29 +53,16 @@ jobs:
 
   # Run acceptance tests in a matrix with Terraform CLI versions
   test:
-    name: Terraform Provider Acceptance Tests
+    name: Unit Test
     needs: build
     runs-on: ubuntu-latest
-    timeout-minutes: 15
-    strategy:
-      fail-fast: false
-      matrix:
-        # list whatever Terraform versions here you would like to support
-        terraform:
-          - "1.10.*"
+    timeout-minutes: 5
     steps:
       - uses: actions/[email protected]
       - uses: actions/[email protected]
         with:
           go-version-file: "go.mod"
           cache: true
-      - uses: hashicorp/[email protected]
-        with:
-          terraform_version: ${{ matrix.terraform }}
-          terraform_wrapper: false
       - run: go mod download
-      - env:
-          TF_ACC: "1"
-          CORTEX_API_TOKEN: ${{ secrets.CORTEX_API_TOKEN }}
-        run: go test -v -cover ./... # later, change to: ./internal/provider/
-        timeout-minutes: 10
+      - name: Unit tests
+        run: make test

Makefile

@@ -46,4 +46,4 @@ test:
 # acceptance tests
 testacc:
 	go clean -testcache
-	TF_LOG=$(TF_LOG) TF_ACC=1 go test ./... -v $(TESTARGS) -timeout 120m
+	TF_LOG=$(TF_LOG) TF_ACC=1 go test ./... -v $(TESTARGS) -timeout 10m