Merge branch 'main' into e2e-jmx

aws · Dec 18, 2024 · b9ae22b · b9ae22b
2 parents a10dc57 + f92b85b
commit b9ae22b
Show file tree

Hide file tree

Showing 3 changed files with 61 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-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"
       }
 ]
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
   }
 ]