Skip to content

Commit b93158a

Browse files
authored
CI: require Ephemeral Tests to use 1.10 + add 1.10 TF into CI (hashicorp#2642)
* require ephemeral tests to only run on 1.10 * include 1.10.1 in acceptance tests workflows * use SkipBelow instead of require
1 parent 88ae6ef commit b93158a

File tree

7 files changed

+14
-5
lines changed

7 files changed

+14
-5
lines changed

.github/workflows/acceptance_tests_aks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ on:
2929

3030
env:
3131
KUBE_CONFIG_PATH: ${{ github.workspace }}/kubernetes/test-infra/aks/kubeconfig
32-
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || vars.TERRAFORM_VERSION }}
32+
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || vars.TERRAFORM_VERSION || '1.10.1' }}
3333
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || vars.PARALLEL_RUNS }}
3434
TF_VAR_location: ${{ github.event.inputs.location || vars.AZURE_LOCATION }}
3535
TF_VAR_node_count: ${{ github.event.inputs.nodeCount || vars.AZURE_NODE_COUNT }}

.github/workflows/acceptance_tests_eks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ env:
3434
AWS_REGION: ${{ github.event.inputs.region || vars.AWS_REGION }}
3535
KUBE_CONFIG_PATH: ${{ github.workspace }}/kubernetes/test-infra/eks/kubeconfig
3636
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || vars.PARALLEL_RUNS }}
37-
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || vars.TERRAFORM_VERSION }}
37+
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || vars.TERRAFORM_VERSION || '1.10.1' }}
3838
TF_VAR_az_span: ${{ github.event.inputs.azSpan || vars.AWS_AZ_NUMBER }}
3939
TF_VAR_capacity_type: ${{ vars.AWS_CAPACITY_TYPE }}
4040
TF_VAR_cluster_version: ${{ github.event.inputs.clusterVersion || vars.CLUSTER_VERSION }}

.github/workflows/acceptance_tests_gke.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ env:
3737
USE_GKE_GCLOUD_AUTH_PLUGIN: True
3838
KUBE_CONFIG_PATH: ${{ github.workspace }}/kubernetes/test-infra/gke/kubeconfig
3939
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || vars.PARALLEL_RUNS }}
40-
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || vars.TERRAFORM_VERSION }}
40+
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || vars.TERRAFORM_VERSION || '1.10.1' }}
4141
TF_VAR_cluster_version: ${{ github.event.inputs.clusterVersion || vars.CLUSTER_VERSION }}
4242
TF_VAR_node_count: ${{ github.event.inputs.nodeCount || vars.GOOGLE_NODE_COUNT }}
4343
TF_VAR_instance_type: ${{ github.event.inputs.instanceType || vars.GOOGLE_INSTANCE_TYPE }}

.github/workflows/acceptance_tests_kind.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
default: "^TestAcc"
1212
terraformVersion:
1313
description: Terraform version
14-
default: 1.10.0-rc3 # FIXME update this once 1.10 goes out
14+
default: 1.10.1
1515
parallelRuns:
1616
description: The maximum number of tests to run simultaneously
1717
default: 8
@@ -29,7 +29,7 @@ env:
2929
KUBECONFIG: ${{ github.workspace }}/.kube/config
3030
KIND_VERSION: ${{ github.event.inputs.kindVersion || vars.KIND_VERSION || '0.25.0' }}
3131
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || vars.PARALLEL_RUNS || '8' }}
32-
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || vars.TERRAFORM_VERSION || '1.10.0-rc3' }}
32+
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || vars.TERRAFORM_VERSION || '1.10.1' }}
3333

3434
jobs:
3535
acceptance_tests_kind:

.github/workflows/check_examples.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
- "1.6.0"
3333
- "1.7.0"
3434
- "1.8.0"
35+
- "1.10.1"
3536
env:
3637
TF_X_KUBERNETES_MANIFEST_RESOURCE: 1
3738
TERM: linux

internal/framework/provider/authenticationv1/ephemeral_token_request_v1_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/hashicorp/terraform-plugin-testing/knownvalue"
1111
"github.com/hashicorp/terraform-plugin-testing/statecheck"
1212
"github.com/hashicorp/terraform-plugin-testing/tfjsonpath"
13+
"github.com/hashicorp/terraform-plugin-testing/tfversion"
1314
)
1415

1516
func TestAccEpehemeralTokenRequest_basic(t *testing.T) {
@@ -18,6 +19,9 @@ func TestAccEpehemeralTokenRequest_basic(t *testing.T) {
1819

1920
resource.ParallelTest(t, resource.TestCase{
2021
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
22+
TerraformVersionChecks: []tfversion.TerraformVersionCheck{
23+
tfversion.SkipBelow(tfversion.Version1_10_0),
24+
},
2125
Steps: []resource.TestStep{
2226
{
2327
Config: testEphemeralTokenRequestV1Config(name, namespace),

internal/framework/provider/certificatesv1/ephemeral_certificate_signing_request_v1_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,17 @@ import (
1010
"github.com/hashicorp/terraform-plugin-testing/knownvalue"
1111
"github.com/hashicorp/terraform-plugin-testing/statecheck"
1212
"github.com/hashicorp/terraform-plugin-testing/tfjsonpath"
13+
"github.com/hashicorp/terraform-plugin-testing/tfversion"
1314
)
1415

1516
func TestAccEpehemeralCertificateSigningRequest_basic(t *testing.T) {
1617
name := "test"
1718

1819
resource.ParallelTest(t, resource.TestCase{
1920
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
21+
TerraformVersionChecks: []tfversion.TerraformVersionCheck{
22+
tfversion.SkipBelow(tfversion.Version1_10_0),
23+
},
2024
Steps: []resource.TestStep{
2125
{
2226
Config: testEphemeralCertificateSigningRequestRequestV1Config(name),

0 commit comments

Comments
 (0)