Skip to content

Commit 3ed67ab

Browse files
committed
skip workspace_run tests for 1 year
1 parent 65b7819 commit 3ed67ab

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ jobs:
5151
admin_subscription_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.subscription }}
5252
admin_support_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.support }}
5353
admin_version_maintenance_token: ${{ fromJSON(steps.tflocal.outputs.workspace-outputs-json).tfe_admin_token_by_role.version-maintenance }}
54-
enterprise: "1"
5554
# Run terminal cmd 'go help testflag' to learn more about -list flag
5655
# action.yml uses https://github.com/hashicorp-forge/go-test-split-action/blob/main/action.yml to split acceptance tests
5756
# which runs against all tests using the list arg

internal/provider/helper_test.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ func testTfeClient(t *testing.T, options testClientOptions) *tfe.Client {
5252
// Attempts to upgrade an organization to the business plan. Requires a user token with admin access.
5353
// DEPRECATED : Please use the newSubscriptionUpdater instead.
5454
func upgradeOrganizationSubscription(t *testing.T, _ *tfe.Client, organization *tfe.Organization) {
55-
if enterpriseEnabled() {
56-
return
57-
}
58-
5955
newSubscriptionUpdater(organization).WithBusinessPlan().Update(t)
6056
}
6157

@@ -65,9 +61,7 @@ func createBusinessOrganization(t *testing.T, client *tfe.Client) (*tfe.Organiza
6561
Email: tfe.String(fmt.Sprintf("%[email protected]", randomString(t))),
6662
})
6763

68-
if !enterpriseEnabled() {
69-
newSubscriptionUpdater(org).WithBusinessPlan().Update(t)
70-
}
64+
newSubscriptionUpdater(org).WithBusinessPlan().Update(t)
7165

7266
return org, orgCleanup
7367
}

internal/provider/resource_tfe_workspace_run_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ import (
1616
)
1717

1818
func TestAccTFEWorkspaceRun_withApplyOnlyBlock(t *testing.T) {
19+
// Currently, tflocal cloud box is incapable of running terraform more than once at a time
20+
// due to the use of the raw_exec nomad driver.
21+
skipUnlessAfterDate(t, time.Date(2025, 5, 1, 0, 0, 0, 0, time.UTC))
22+
1923
rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
2024

2125
tfeClient, err := getClientUsingEnv()
@@ -65,6 +69,10 @@ func TestAccTFEWorkspaceRun_withApplyOnlyBlock(t *testing.T) {
6569
}
6670

6771
func TestAccTFEWorkspaceRun_withBothApplyAndDestroyBlocks(t *testing.T) {
72+
// Currently, tflocal cloud box is incapable of running terraform more than once at a time
73+
// due to the use of the raw_exec nomad driver.
74+
skipUnlessAfterDate(t, time.Date(2025, 5, 1, 0, 0, 0, 0, time.UTC))
75+
6876
rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
6977

7078
tfeClient, err := getClientUsingEnv()

0 commit comments

Comments
 (0)