Skip to content

Commit a18e022

Browse files
sebasslashsebasslash
committed
Re-enable test concurrency
1 parent e109075 commit a18e022

File tree

2 files changed

+64
-68
lines changed

2 files changed

+64
-68
lines changed

‎.github/actions/test-provider-tfe/action.yml‎

Lines changed: 62 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -51,76 +51,72 @@ inputs:
5151
runs:
5252
using: composite
5353
steps:
54-
- name: NO-OP
54+
- name: Set up Go
55+
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
56+
with:
57+
go-version-file: go.mod
58+
cache: true
59+
60+
- name: Sync dependencies
5561
shell: bash
5662
run: |
57-
echo "Tests are skipped. Please test manually."
58-
# - name: Set up Go
59-
# uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
60-
# with:
61-
# go-version-file: go.mod
62-
# cache: true
63-
64-
# - name: Sync dependencies
65-
# shell: bash
66-
# run: |
67-
# go mod download
68-
# go mod tidy
63+
go mod download
64+
go mod tidy
6965
70-
# - name: Install gotestsum
71-
# shell: bash
72-
# run: go install gotest.tools/gotestsum@latest
66+
- name: Install gotestsum
67+
shell: bash
68+
run: go install gotest.tools/gotestsum@latest
7369

74-
# - name: Download artifact
75-
# id: download-artifact
76-
# uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615 # v2.27.0
77-
# with:
78-
# workflow_conclusion: success
79-
# name: junit-test-summary
80-
# if_no_artifact_found: warn
81-
# branch: main
70+
- name: Download artifact
71+
id: download-artifact
72+
uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615 # v2.27.0
73+
with:
74+
workflow_conclusion: success
75+
name: junit-test-summary
76+
if_no_artifact_found: warn
77+
branch: main
8278

83-
# - name: Split acceptance tests
84-
# id: test_split
85-
# uses: hashicorp-forge/go-test-split-action@796beedbdb3d1bea14cad2d3057bab5c5cf15fe5 # v1.0.2
86-
# with:
87-
# index: ${{ inputs.matrix_index }}
88-
# total: ${{ inputs.matrix_total }}
89-
# junit-summary: ./ci-summary-provider.xml
90-
# # When tests are split and run concurrently, lists_tests arg in ci.yml will skip the TestAccTFESAMLSettings_omnibus test suite
91-
# list: ${{ inputs.list_tests }}
79+
- name: Split acceptance tests
80+
id: test_split
81+
uses: hashicorp-forge/go-test-split-action@796beedbdb3d1bea14cad2d3057bab5c5cf15fe5 # v1.0.2
82+
with:
83+
index: ${{ inputs.matrix_index }}
84+
total: ${{ inputs.matrix_total }}
85+
junit-summary: ./ci-summary-provider.xml
86+
# When tests are split and run concurrently, lists_tests arg in ci.yml will skip the TestAccTFESAMLSettings_omnibus test suite
87+
list: ${{ inputs.list_tests }}
9288

93-
# - name: Run Tests
94-
# shell: bash
95-
# env:
96-
# TFE_HOSTNAME: "${{ inputs.hostname }}"
97-
# TFE_TOKEN: "${{ inputs.token }}"
98-
# TFE_ADMIN_CONFIGURATION_TOKEN: ${{ inputs.admin_configuration_token }}
99-
# TFE_ADMIN_PROVISION_LICENSES_TOKEN: ${{ inputs.admin_provision_licenses_token }}
100-
# TFE_ADMIN_SECURITY_MAINTENANCE_TOKEN: ${{ inputs.admin_security_maintenance_token }}
101-
# TFE_ADMIN_SITE_ADMIN_TOKEN: ${{ inputs.admin_site_admin_token }}
102-
# TFE_ADMIN_SUBSCRIPTION_TOKEN: ${{ inputs.admin_subscription_token }}
103-
# TFE_ADMIN_SUPPORT_TOKEN: ${{ inputs.admin_support_token }}
104-
# TFE_ADMIN_VERSION_MAINTENANCE_TOKEN: ${{ inputs.admin_version_maintenance_token }}
105-
# TFE_USER1: tfe-provider-user1
106-
# TFE_USER2: tfe-provider-user2
107-
# TF_ACC: "1"
108-
# ENABLE_TFE: "${{ inputs.enterprise }}"
109-
# RUN_TASKS_URL: "http://testing-mocks.tfe:22180/runtasks/pass"
110-
# GITHUB_POLICY_SET_IDENTIFIER: "hashicorp/test-policy-set"
111-
# GITHUB_REGISTRY_MODULE_IDENTIFIER: "hashicorp/terraform-random-module"
112-
# GITHUB_WORKSPACE_IDENTIFIER: "hashicorp/terraform-random-module"
113-
# GITHUB_WORKSPACE_BRANCH: "main"
114-
# GITHUB_TOKEN: "${{ inputs.testing-github-token }}"
115-
# MOD_PROVIDER: github.com/hashicorp/terraform-provider-tfe
116-
# MOD_TFE: github.com/hashicorp/terraform-provider-tfe/internal/provider
117-
# MOD_VERSION: github.com/hashicorp/terraform-provider-tfe/version
118-
# run: |
119-
# gotestsum --junitfile summary.xml --format short-verbose -- $MOD_PROVIDER $MOD_TFE $MOD_VERSION -v -timeout=30m -run "${{ steps.test_split.outputs.run }}"
89+
- name: Run Tests
90+
shell: bash
91+
env:
92+
TFE_HOSTNAME: "${{ inputs.hostname }}"
93+
TFE_TOKEN: "${{ inputs.token }}"
94+
TFE_ADMIN_CONFIGURATION_TOKEN: ${{ inputs.admin_configuration_token }}
95+
TFE_ADMIN_PROVISION_LICENSES_TOKEN: ${{ inputs.admin_provision_licenses_token }}
96+
TFE_ADMIN_SECURITY_MAINTENANCE_TOKEN: ${{ inputs.admin_security_maintenance_token }}
97+
TFE_ADMIN_SITE_ADMIN_TOKEN: ${{ inputs.admin_site_admin_token }}
98+
TFE_ADMIN_SUBSCRIPTION_TOKEN: ${{ inputs.admin_subscription_token }}
99+
TFE_ADMIN_SUPPORT_TOKEN: ${{ inputs.admin_support_token }}
100+
TFE_ADMIN_VERSION_MAINTENANCE_TOKEN: ${{ inputs.admin_version_maintenance_token }}
101+
TFE_USER1: tfe-provider-user1
102+
TFE_USER2: tfe-provider-user2
103+
TF_ACC: "1"
104+
ENABLE_TFE: "${{ inputs.enterprise }}"
105+
RUN_TASKS_URL: "http://testing-mocks.tfe:22180/runtasks/pass"
106+
GITHUB_POLICY_SET_IDENTIFIER: "hashicorp/test-policy-set"
107+
GITHUB_REGISTRY_MODULE_IDENTIFIER: "hashicorp/terraform-random-module"
108+
GITHUB_WORKSPACE_IDENTIFIER: "hashicorp/terraform-random-module"
109+
GITHUB_WORKSPACE_BRANCH: "main"
110+
GITHUB_TOKEN: "${{ inputs.testing-github-token }}"
111+
MOD_PROVIDER: github.com/hashicorp/terraform-provider-tfe
112+
MOD_TFE: github.com/hashicorp/terraform-provider-tfe/internal/provider
113+
MOD_VERSION: github.com/hashicorp/terraform-provider-tfe/version
114+
run: |
115+
gotestsum --junitfile summary.xml --format short-verbose -- $MOD_PROVIDER $MOD_TFE $MOD_VERSION -v -timeout=30m -run "${{ steps.test_split.outputs.run }}"
120116
121-
# - name: Upload test artifacts
122-
# uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
123-
# with:
124-
# name: junit-test-summary-${{ matrix.index }}
125-
# path: summary.xml
126-
# retention-days: 1
117+
- name: Upload test artifacts
118+
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
119+
with:
120+
name: junit-test-summary-${{ matrix.index }}
121+
path: summary.xml
122+
retention-days: 1

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
fail-fast: false
3232
matrix:
3333
# If you adjust these parameters, also adjust the jrm input files on the "Merge reports" step below
34-
total: [ 1 ]
35-
index: [ 0 ]
34+
total: [ 5 ]
35+
index: [ 0, 1, 2, 3, 4 ]
3636
steps:
3737
- name: Fetch Outputs
3838
id: tflocal

0 commit comments

Comments
 (0)