Merge branch 'terraform' into merge-conflict-trace-validator

bhautikpip · web-flow · commit b8fa72a7f7ff · 2020-10-19T20:51:25.000-07:00
diff --git a/terraform/testing-suites/jssdk-ecs.tfvars b/terraform/testing-suites/jssdk-ecs.tfvars
@@ -0,0 +1,9 @@
+validation_config="default-trace-validation.yml"
+
+aoc_image_repo="020628701572.dkr.ecr.us-west-2.amazonaws.com/aws/aws-otel-collector"
+
+aoc_version="latest"
+
+data_emitter_image="611364707713.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-otel-js-sample-app:d72f29f20b47521109e78f2b26f90f4fd4fc4b48"
+
+ecs_launch_type="FARGATE"
diff --git a/terraform/testing-suites/xrayreceiver-ecs.tfvars b/terraform/testing-suites/xrayreceiver-ecs.tfvars
@@ -2,7 +2,7 @@ otconfig_path="../template/otconfig/xrayreceiver_otconfig.tpl"
 ecs_taskdef_path="../template/ecstaskdef/xrayreceiver_ecs_taskdef.tpl"
 
 # this file is defined in validator/src/main/resources/validations
-validation_config="xrayreceiver-trace-validation.yml"
+validation_config="default-trace-validation.yml"
 
 data_emitter_image="josephwy/integ-test-emitter:xrayreceiver"
 
diff --git a/validator/src/main/resources/validations/xrayreceiver-trace-validation.yml b/validator/src/main/resources/validations/xrayreceiver-trace-validation.yml
