adding windows 2025 test

aws · Dec 17, 2024 · 73723e9 · 73723e9
1 parent ed779d3
commit 73723e9
Show file tree

Hide file tree

Showing 6 changed files with 127 additions and 0 deletions.
diff --git a/generator/resources/ec2_windows_performance_test_matrix.json b/generator/resources/ec2_windows_performance_test_matrix.json
@@ -19,5 +19,26 @@
         "arc": "amd64",
         "valuesPerMinute": 5000,
         "family": "windows"
+      },
+      {
+        "os": "win-2025",
+        "ami": "cloudwatch-agent-integration-test-win-2025*",
+        "arc": "amd64",
+        "valuesPerMinute": 100,
+        "family": "windows"
+      },
+      {
+        "os": "win-2022",
+        "ami": "cloudwatch-agent-integration-test-win-2025*",
+        "arc": "amd64",
+        "valuesPerMinute": 1000,
+        "family": "windows"
+      },
+      {
+        "os": "win-2022",
+        "ami": "cloudwatch-agent-integration-test-win-2025*",
+        "arc": "amd64",
+        "valuesPerMinute": 5000,
+        "family": "windows"
       }
 ]
diff --git a/generator/resources/ec2_windows_stress_test_matrix.json b/generator/resources/ec2_windows_stress_test_matrix.json
@@ -26,5 +26,33 @@
     "arc": "amd64",
     "valuesPerMinute": 50000,
     "family": "windows"
+  },
+  {
+    "os": "win-2025",
+    "ami": "cloudwatch-agent-integration-test-win-2025*",
+    "arc": "amd64",
+    "valuesPerMinute": 1000,
+    "family": "windows"
+  },
+  {
+    "os": "win-2025",
+    "ami": "cloudwatch-agent-integration-test-win-2025*",
+    "arc": "amd64",
+    "valuesPerMinute": 5000,
+    "family": "windows"
+  },
+  {
+    "os": "win-2025",
+    "ami": "cloudwatch-agent-integration-test-win-2025*",
+    "arc": "amd64",
+    "valuesPerMinute": 10000,
+    "family": "windows"
+  },
+  {
+    "os": "win-2025",
+    "ami": "cloudwatch-agent-integration-test-win-2025*",
+    "arc": "amd64",
+    "valuesPerMinute": 50000,
+    "family": "windows"
   }
 ]
diff --git a/generator/resources/ec2_windows_test_matrix.json b/generator/resources/ec2_windows_test_matrix.json
@@ -28,5 +28,17 @@
     "instanceType":"t3a.medium",
     "ami": "cloudwatch-agent-integration-test-win-2022*",
     "useSSM": true
+  },
+  {
+    "os": "win-2025",
+    "instanceType":"t3a.medium",
+    "ami": "cloudwatch-agent-integration-test-win-2025*",
+    "useSSM": false
+  },
+  {
+    "os": "win-2025",
+    "instanceType":"t3a.medium",
+    "ami": "cloudwatch-agent-integration-test-win-2025*",
+    "useSSM": true
   }
 ]
diff --git a/generator/test_case_generator.go b/generator/test_case_generator.go
@@ -210,6 +210,11 @@ var testTypeToTestConfig = map[string][]testConfig{
 			terraformDir: "terraform/eks/daemon/windows/2022",
 			targets:      map[string]map[string]struct{}{"arc": {"amd64": {}}},
 		},
+		{
+			testDir:      "./test/metric_value_benchmark",
+			terraformDir: "terraform/eks/daemon/windows/2025",
+			targets:      map[string]map[string]struct{}{"arc": {"amd64": {}}},
+		},
 		{
 			testDir: "./test/statsd", terraformDir: "terraform/eks/daemon/statsd",
 			targets: map[string]map[string]struct{}{"arc": {"amd64": {}}},

diff --git a/terraform/eks/daemon/windows/2025/main.tf b/terraform/eks/daemon/windows/2025/main.tf
@@ -0,0 +1,14 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+module "windows" {
+  source             = "../"
+  windows_ami_type   = var.windows_ami_type
+  windows_os_version = var.windows_os_version
+  test_dir           = var.test_dir
+  ami_type           = var.ami_type
+  instance_type      = var.instance_type
+  k8s_version        = var.k8s_version
+  cwagent_image_repo = var.cwagent_image_repo
+  cwagent_image_tag  = var.cwagent_image_tag
+}
diff --git a/terraform/eks/daemon/windows/2025/variables.tf b/terraform/eks/daemon/windows/2025/variables.tf
@@ -0,0 +1,47 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+variable "region" {
+  type    = string
+  default = "us-west-2"
+}
+
+variable "test_dir" {
+  type    = string
+  default = "./test/metric_value_benchmark"
+}
+
+variable "cwagent_image_repo" {
+  type    = string
+  default = "public.ecr.aws/cloudwatch-agent/cloudwatch-agent"
+}
+
+variable "cwagent_image_tag" {
+  type    = string
+  default = "latest"
+}
+
+variable "k8s_version" {
+  type    = string
+  default = "1.24"
+}
+
+variable "ami_type" {
+  type    = string
+  default = "AL2_x86_64"
+}
+
+variable "instance_type" {
+  type    = string
+  default = "t3a.medium"
+}
+
+variable "windows_ami_type" {
+  type    = string
+  default = "WINDOWS_CORE_2025_x86_64"
+}
+
+variable "windows_os_version" {
+  type    = string
+  default = "2025"
+}