Added tags.

integration-tests/amazon-cloudwatch-observability/terraform/helm-windows/main.tf

@@ -234,6 +234,6 @@ resource "null_resource" "validator" {
     null_resource.deployment_wait
   ]
   provisioner "local-exec" {
-    command = "go test ${var.test_dir} -v"
+    command = "go test ${var.test_dir} -v --tags=windowslinux"
   }
 }

integration-tests/amazon-cloudwatch-observability/terraform/helm/main.tf

@@ -131,6 +131,6 @@ resource "null_resource" "validator" {
     helm_release.this
   ]
   provisioner "local-exec" {
-    command = "go test ${var.test_dir} -v"
+    command = "go test ${var.test_dir} -v --tags=linuxonly"
   }
 }

integration-tests/amazon-cloudwatch-observability/validator/resourceCount_linuxonly_test.go

@@ -0,0 +1,21 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+//go:build linuxonly
+// +build linuxonly
+
+package validator
+
+const (
+	// Services count for CW agent on Linux and Windows
+	serviceCountLinux   = 6
+	serviceCountWindows = 3
+
+	// DaemonSet count for CW agent on Linux and Windows
+	daemonsetCountLinux   = 4
+	daemonsetCountWindows = 2
+
+	// Pods count for CW agent on Linux and Windows
+	podCountLinux   = 3
+	podCountWindows = 0
+)

integration-tests/amazon-cloudwatch-observability/validator/resourceCount_windowslinux_test.go

@@ -0,0 +1,21 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+//go:build windowslinux
+// +build windowslinux
+
+package validator
+
+const (
+	// Services count for CW agent on Linux and Windows
+	serviceCountLinux   = 6
+	serviceCountWindows = 3
+
+	// DaemonSet count for CW agent on Linux and Windows
+	daemonsetCountLinux   = 4
+	daemonsetCountWindows = 2
+
+	// Pods count for CW agent on Linux and Windows
+	podCountLinux   = 3
+	podCountWindows = 2
+)

integration-tests/amazon-cloudwatch-observability/validator/validateResources_test.go

@@ -1,6 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+//go:build linuxonly || windowslinux
+// +build linuxonly windowslinux
+
 package validator
 
 import (
@@ -36,6 +39,10 @@ const (
 	serviceNameRegex     = agentName + "(-headless|-monitoring)?|" + agentNameWindows + "(-headless|-monitoring)?|" + addOnName + "-webhook-service|" + dcgmExporterName + "-service|" + neuronMonitor + "-service"
 )
 
+const (
+	podCount = podCountLinux + podCountWindows
+)
+
 func TestOperatorOnEKs(t *testing.T) {
 	userHomeDir, err := os.UserHomeDir()
 	if err != nil {
@@ -63,7 +70,7 @@ func TestOperatorOnEKs(t *testing.T) {
 	//Validating the number of pods and status
 	pods, err := ListPods(nameSpace, clientSet)
 	assert.NoError(t, err)
-	assert.Len(t, pods.Items, 5)
+	assert.Len(t, pods.Items, 3)
 	for _, pod := range pods.Items {
 		fmt.Println("pod name: " + pod.Name + " namespace:" + pod.Namespace)
 		assert.Contains(t, []v1.PodPhase{v1.PodRunning, v1.PodPending}, pod.Status.Phase)