From b697c452503855eccb6cd9874d4beab98f045958 Mon Sep 17 00:00:00 2001 From: Hyunsoo Kim Date: Fri, 22 Dec 2023 16:24:08 -0500 Subject: [PATCH] revert tests comment out --- generator/test_case_generator.go | 270 +++++++++++++++---------------- 1 file changed, 135 insertions(+), 135 deletions(-) diff --git a/generator/test_case_generator.go b/generator/test_case_generator.go index e39e7af14..85f534c3a 100644 --- a/generator/test_case_generator.go +++ b/generator/test_case_generator.go @@ -54,60 +54,60 @@ const ( // you can't have a const map in golang var testTypeToTestConfig = map[string][]testConfig{ - //"ec2_gpu": { - // {testDir: "./test/nvidia_gpu"}, - //}, + "ec2_gpu": { + {testDir: "./test/nvidia_gpu"}, + }, testTypeKeyEc2Linux: { - //{testDir: "./test/ca_bundle"}, - //{testDir: "./test/cloudwatchlogs"}, - //{ - // testDir: "./test/metrics_number_dimension", - // targets: map[string]map[string]struct{}{"os": {"al2": {}}}, - //}, - //{ - // testDir: "./test/emf_concurrent", - // targets: map[string]map[string]struct{}{"os": {"al2": {}}}, - // maxAttempts: 1, - //}, - //{testDir: "./test/metric_value_benchmark"}, - //{testDir: "./test/run_as_user"}, - //{testDir: "./test/collection_interval"}, - //{testDir: "./test/metric_dimension"}, - //{testDir: "./test/restart"}, - //{testDir: "./test/xray"}, - //{testDir: "./test/otlp"}, - //{ - // testDir: "./test/acceptance", - // targets: map[string]map[string]struct{}{"os": {"ubuntu-20.04": {}}}, - //}, - //// skipping FIPS test as the test cannot be verified - //// neither ssh nor SSM works after a reboot once FIPS is enabled - ////{ - //// testDir: "./test/fips", - //// targets: map[string]map[string]struct{}{"os": {"rhel8": {}}}, - ////}, - //{ - // testDir: "./test/lvm", - // targets: map[string]map[string]struct{}{"os": {"al2": {}}}, - //}, - //{ - // testDir: "./test/proxy", - // targets: map[string]map[string]struct{}{"os": {"al2": {}}}, - //}, - //{ - // testDir: "./test/ssl_cert", - // targets: map[string]map[string]struct{}{"os": {"al2": {}}}, - //}, - //{ - // testDir: "./test/userdata", - // terraformDir: "terraform/ec2/userdata", - // targets: map[string]map[string]struct{}{"os": {"ol9": {}}}, - //}, + {testDir: "./test/ca_bundle"}, + {testDir: "./test/cloudwatchlogs"}, + { + testDir: "./test/metrics_number_dimension", + targets: map[string]map[string]struct{}{"os": {"al2": {}}}, + }, + { + testDir: "./test/emf_concurrent", + targets: map[string]map[string]struct{}{"os": {"al2": {}}}, + maxAttempts: 1, + }, + {testDir: "./test/metric_value_benchmark"}, + {testDir: "./test/run_as_user"}, + {testDir: "./test/collection_interval"}, + {testDir: "./test/metric_dimension"}, + {testDir: "./test/restart"}, + {testDir: "./test/xray"}, + {testDir: "./test/otlp"}, + { + testDir: "./test/acceptance", + targets: map[string]map[string]struct{}{"os": {"ubuntu-20.04": {}}}, + }, + // skipping FIPS test as the test cannot be verified + // neither ssh nor SSM works after a reboot once FIPS is enabled //{ - // testDir: "./test/assume_role", - // terraformDir: "terraform/ec2/creds", - // targets: map[string]map[string]struct{}{"os": {"al2": {}}}, + // testDir: "./test/fips", + // targets: map[string]map[string]struct{}{"os": {"rhel8": {}}}, //}, + { + testDir: "./test/lvm", + targets: map[string]map[string]struct{}{"os": {"al2": {}}}, + }, + { + testDir: "./test/proxy", + targets: map[string]map[string]struct{}{"os": {"al2": {}}}, + }, + { + testDir: "./test/ssl_cert", + targets: map[string]map[string]struct{}{"os": {"al2": {}}}, + }, + { + testDir: "./test/userdata", + terraformDir: "terraform/ec2/userdata", + targets: map[string]map[string]struct{}{"os": {"ol9": {}}}, + }, + { + testDir: "./test/assume_role", + terraformDir: "terraform/ec2/creds", + targets: map[string]map[string]struct{}{"os": {"al2": {}}}, + }, { testDir: "./test/app_signals", terraformDir: "terraform/ec2/app_signals", @@ -119,94 +119,94 @@ var testTypeToTestConfig = map[string][]testConfig{ Therefore, limit down the scope for testing in Mac since EC2 can be done with Linux and Mac under the hood share similar plugins with Linux */ - //"ec2_mac": { - // {testDir: "../../../test/feature/mac"}, - //}, - //"ec2_windows": { - // {testDir: "../../../test/feature/windows"}, - // {testDir: "../../../test/restart"}, - // {testDir: "../../../test/acceptance"}, - // {testDir: "../../../test/feature/windows/event_logs"}, - // { - // testDir: "../../../test/feature/windows/custom_start/userdata", - // targets: map[string]map[string]struct{}{"os": {"win-2019": {}}}, - // }, - // { - // testDir: "../../../test/feature/windows/custom_start/ssm_start", - // targets: map[string]map[string]struct{}{"os": {"win-2019": {}}}, - // }, - // // assume role test doesn't add much value, and it already being tested with linux - // //{testDir: "../../../test/assume_role"}, - //}, - //"ec2_performance": { - // {testDir: "../../test/performance/emf"}, - // {testDir: "../../test/performance/logs"}, - // {testDir: "../../test/performance/system"}, - // {testDir: "../../test/performance/statsd"}, - // {testDir: "../../test/performance/collectd"}, - // {testDir: "../../test/performance/trace/xray", runMockServer: true}, - //}, - //"ec2_windows_performance": { - // {testDir: "../../test/performance/windows/logs"}, - // {testDir: "../../test/performance/windows/system"}, - //}, - //"ec2_stress": { - // {testDir: "../../test/stress/emf"}, - // {testDir: "../../test/stress/logs"}, - // {testDir: "../../test/stress/system"}, - // {testDir: "../../test/stress/statsd"}, - // {testDir: "../../test/stress/collectd"}, - //}, - //"ec2_windows_stress": { - // {testDir: "../../test/stress/windows/logs"}, - // {testDir: "../../test/stress/windows/system"}, - //}, - //"ecs_fargate": { - // {testDir: "./test/ecs/ecs_metadata"}, - //}, - //"ecs_ec2_daemon": { - // { - // testDir: "./test/metric_value_benchmark", - // targets: map[string]map[string]struct{}{"metadataEnabled": {"enabled": {}}}, - // }, - // { - // testDir: "./test/statsd", - // targets: map[string]map[string]struct{}{"metadataEnabled": {"enabled": {}}}, - // }, - // { - // testDir: "./test/emf", - // targets: map[string]map[string]struct{}{"metadataEnabled": {"disabled": {}}}, - // }, - // { - // testDir: "./test/emf", - // targets: map[string]map[string]struct{}{"metadataEnabled": {"enabled": {}}}, - // }, - //}, + "ec2_mac": { + {testDir: "../../../test/feature/mac"}, + }, + "ec2_windows": { + {testDir: "../../../test/feature/windows"}, + {testDir: "../../../test/restart"}, + {testDir: "../../../test/acceptance"}, + {testDir: "../../../test/feature/windows/event_logs"}, + { + testDir: "../../../test/feature/windows/custom_start/userdata", + targets: map[string]map[string]struct{}{"os": {"win-2019": {}}}, + }, + { + testDir: "../../../test/feature/windows/custom_start/ssm_start", + targets: map[string]map[string]struct{}{"os": {"win-2019": {}}}, + }, + // assume role test doesn't add much value, and it already being tested with linux + //{testDir: "../../../test/assume_role"}, + }, + "ec2_performance": { + {testDir: "../../test/performance/emf"}, + {testDir: "../../test/performance/logs"}, + {testDir: "../../test/performance/system"}, + {testDir: "../../test/performance/statsd"}, + {testDir: "../../test/performance/collectd"}, + {testDir: "../../test/performance/trace/xray", runMockServer: true}, + }, + "ec2_windows_performance": { + {testDir: "../../test/performance/windows/logs"}, + {testDir: "../../test/performance/windows/system"}, + }, + "ec2_stress": { + {testDir: "../../test/stress/emf"}, + {testDir: "../../test/stress/logs"}, + {testDir: "../../test/stress/system"}, + {testDir: "../../test/stress/statsd"}, + {testDir: "../../test/stress/collectd"}, + }, + "ec2_windows_stress": { + {testDir: "../../test/stress/windows/logs"}, + {testDir: "../../test/stress/windows/system"}, + }, + "ecs_fargate": { + {testDir: "./test/ecs/ecs_metadata"}, + }, + "ecs_ec2_daemon": { + { + testDir: "./test/metric_value_benchmark", + targets: map[string]map[string]struct{}{"metadataEnabled": {"enabled": {}}}, + }, + { + testDir: "./test/statsd", + targets: map[string]map[string]struct{}{"metadataEnabled": {"enabled": {}}}, + }, + { + testDir: "./test/emf", + targets: map[string]map[string]struct{}{"metadataEnabled": {"disabled": {}}}, + }, + { + testDir: "./test/emf", + targets: map[string]map[string]struct{}{"metadataEnabled": {"enabled": {}}}, + }, + }, "eks_daemon": { - //{ - // testDir: "./test/metric_value_benchmark", - // targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, - //}, - //{ - // testDir: "./test/statsd", terraformDir: "terraform/eks/daemon/statsd", - // targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, - //}, - //{ - // testDir: "./test/emf", terraformDir: "terraform/eks/daemon/emf", - // targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, - //}, - //{ - // testDir: "./test/fluent", terraformDir: "terraform/eks/daemon/fluent/d", - // targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, - //}, - //{testDir: "./test/fluent", terraformDir: "terraform/eks/daemon/fluent/bit"}, + { + testDir: "./test/metric_value_benchmark", + targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, + }, + { + testDir: "./test/statsd", terraformDir: "terraform/eks/daemon/statsd", + targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, + }, + { + testDir: "./test/emf", terraformDir: "terraform/eks/daemon/emf", + targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, + }, + { + testDir: "./test/fluent", terraformDir: "terraform/eks/daemon/fluent/d", + targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, + }, + {testDir: "./test/fluent", terraformDir: "terraform/eks/daemon/fluent/bit"}, {testDir: "./test/app_signals", terraformDir: "terraform/eks/daemon/app_signals", targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, }, }, - //"eks_deployment": { - // {testDir: "./test/metric_value_benchmark"}, - //}, + "eks_deployment": { + {testDir: "./test/metric_value_benchmark"}, + }, } func copyAllEC2LinuxTestForOnpremTesting() { @@ -222,7 +222,7 @@ func copyAllEC2LinuxTestForOnpremTesting() { } func main() { - //copyAllEC2LinuxTestForOnpremTesting() + copyAllEC2LinuxTestForOnpremTesting() for testType, testConfigs := range testTypeToTestConfig { testMatrix := genMatrix(testType, testConfigs)