Skip to content

Commit 0ae198c

Browse files
authored
Merge pull request #3074 from aws-observability/settf
Remove unsupported k8s, pin tf version
2 parents f4eb1b9 + 1a887ec commit 0ae198c

File tree

4 files changed

+3
-21
lines changed

4 files changed

+3
-21
lines changed

.github/config/testcases.json

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33
{
44
"type": "EKS",
55
"targets": [
6-
{
7-
"name": "collector-ci-amd64-1-26",
8-
"region": "us-west-2",
9-
"excluded_tests": [
10-
"containerinsight_eks"
11-
]
12-
},
136
{
147
"name": "collector-ci-amd64-1-27",
158
"region": "us-west-2",
@@ -50,13 +43,6 @@
5043
{
5144
"type": "EKS_ARM64",
5245
"targets": [
53-
{
54-
"name": "collector-ci-arm64-1-26",
55-
"region": "us-west-2",
56-
"excluded_tests": [
57-
"containerinsight_eks"
58-
]
59-
},
6046
{
6147
"name": "collector-ci-arm64-1-27",
6248
"region": "us-west-2",
@@ -97,10 +83,6 @@
9783
{
9884
"type": "EKS_FARGATE",
9985
"targets": [
100-
{
101-
"name": "collector-ci-fargate-1-26",
102-
"region": "us-west-2"
103-
},
10486
{
10587
"name": "collector-ci-fargate-1-27",
10688
"region": "us-west-2"

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ jobs:
656656
- name: Set up terraform
657657
uses: hashicorp/setup-terraform@v3
658658
with:
659-
terraform_version: "~1.5"
659+
terraform_version: "1.5.7"
660660

661661
- name: Configure AWS Credentials
662662
if: steps.e2etest-eks.outputs.cache-hit != 'true'

.github/workflows/PR-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ jobs:
342342
if: ${{ needs.changes.outputs.changed == 'true' }}
343343
uses: hashicorp/setup-terraform@v3
344344
with:
345-
terraform_version: "~1.5"
345+
terraform_version: "1.5.7"
346346

347347
- name: restore cached binaries
348348
if: ${{ needs.changes.outputs.changed == 'true' }}

.github/workflows/canary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
- name: Set up terraform
113113
uses: hashicorp/setup-terraform@v3
114114
with:
115-
terraform_version: "~1.5"
115+
terraform_version: "1.5.7"
116116

117117
- name: Check out testing framework
118118
uses: actions/checkout@v4

0 commit comments

Comments
 (0)