From 515b3271a8ad89a3633aa03f6919a954724de447 Mon Sep 17 00:00:00 2001 From: Musa <165414028+musa-asad@users.noreply.github.com> Date: Tue, 4 Jun 2024 15:52:12 -0400 Subject: [PATCH] Removing end-of-life OSes. (#412) --- generator/resources/ec2_mac_test_matrix.json | 12 ------------ generator/resources/ec2_windows_test_matrix.json | 6 ------ terraform/setup/main.tf | 2 -- 3 files changed, 20 deletions(-) diff --git a/generator/resources/ec2_mac_test_matrix.json b/generator/resources/ec2_mac_test_matrix.json index b131e6553..a1c8f9927 100644 --- a/generator/resources/ec2_mac_test_matrix.json +++ b/generator/resources/ec2_mac_test_matrix.json @@ -1,16 +1,4 @@ [ - { - "os": "macOS Big Sur Arm64", - "instanceType":"mac2.metal", - "ami": "cloudwatch-agent-integration-test-mac-bigsur-arm64", - "arc": "arm64" - }, - { - "os": "macOS Big Sur Amd64", - "instanceType":"mac1.metal", - "ami": "cloudwatch-agent-integration-test-mac-bigsur-x86", - "arc": "amd64" - }, { "os": "macOS Ventura Arm64", "instanceType":"mac2.metal", diff --git a/generator/resources/ec2_windows_test_matrix.json b/generator/resources/ec2_windows_test_matrix.json index 8125a3be2..d0874d62c 100644 --- a/generator/resources/ec2_windows_test_matrix.json +++ b/generator/resources/ec2_windows_test_matrix.json @@ -5,12 +5,6 @@ "ami": "cloudwatch-agent-integration-test-win-11*", "useSSM": false }, - { - "os": "win-2012", - "instanceType":"t3a.medium", - "ami": "cloudwatch-agent-integration-test-win-2012*", - "useSSM": false - }, { "os": "win-2016", "instanceType":"t3a.medium", diff --git a/terraform/setup/main.tf b/terraform/setup/main.tf index 1a27ff0c0..f9f41d21d 100644 --- a/terraform/setup/main.tf +++ b/terraform/setup/main.tf @@ -82,9 +82,7 @@ resource "aws_ec2_host" "dedicated_host" { for_each = { "Ventura_x86_64" : "mac1.metal" "Sonoma_x86_64" : "mac1.metal" - "Big_Sur_x86_64" : "mac1.metal" "Ventura_arm64" : "mac2.metal" - "Big_Sur_arm64" : "mac2.metal" "Sonoma_arm64" : "mac2.metal" }