From b0e3e925ef1f9495a608d4001fb0a5fcea318856 Mon Sep 17 00:00:00 2001 From: Seth Levine Date: Thu, 20 Jan 2022 10:34:27 -0500 Subject: [PATCH] EKS ARM64 Test Case Matrix Creation --- .github/workflows/CI.yml | 6 +++++- e2etest/get-testcases.py | 4 ++++ e2etest/testcases.json | 44 ++++++++++++++++++++-------------------- 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 9a8bb9fa64..ba6b453791 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -536,6 +536,7 @@ jobs: runs-on: ubuntu-latest outputs: eks-matrix: ${{ steps.set-matrix.outputs.eks-matrix }} + eks-arm64-matrix: ${{ steps.set-matrix.outputs.eks-arm64-matrix }} eks-fargate-matrix: ${{ steps.set-matrix.outputs.eks-fargate-matrix }} eks-adot-operator-matrix: ${{ steps.set-matrix.outputs.eks-adot-operator-matrix }} ecs-matrix: ${{ steps.set-matrix.outputs.ecs-matrix }} @@ -557,9 +558,11 @@ jobs: ec2_matrix_3=$(python e2etest/get-testcases.py ec2_matrix_3) ecs_matrix=$(python e2etest/get-testcases.py ecs_matrix) eks_matrix=$(python e2etest/get-testcases.py eks_matrix) + eks_arm64_matrix=$(python e2etest/get-testcases.py eks_arm64_matrix) eks_fargate_matrix=$(python e2etest/get-testcases.py eks_fargate_matrix) eks_adot_operator_matrix=$(python e2etest/get-testcases.py eks_adot_operator_matrix) echo "::set-output name=eks-matrix::$eks_matrix" + echo "::set-output name=eks-arm64-matrix::$eks_arm64_matrix" echo "::set-output name=eks-fargate-matrix::$eks_fargate_matrix" echo "::set-output name=eks-adot-operator-matrix::$eks_adot_operator_matrix" echo "::set-output name=ecs-matrix::$ecs_matrix" @@ -569,6 +572,7 @@ jobs: - name: List testing suites run: | echo ${{ steps.set-matrix.outputs.eks-matrix }} + echo ${{ steps.set-matrix.outputs.eks-arm64-matrix }} echo ${{ steps.set-matrix.outputs.eks-fargate-matrix }} echo ${{ steps.set-matrix.outputs.eks-adot-operator-matrix }} echo ${{ steps.set-matrix.outputs.ecs-matrix }} @@ -911,7 +915,7 @@ jobs: strategy: fail-fast: false max-parallel: 5 - matrix: ${{ fromJson(needs.get-testing-suites.outputs.eks-matrix) }} + matrix: ${{ fromJson(needs.get-testing-suites.outputs.eks-arm64-matrix) }} steps: - uses: actions/checkout@v2 diff --git a/e2etest/get-testcases.py b/e2etest/get-testcases.py index 6e039aff16..15e6c0316f 100644 --- a/e2etest/get-testcases.py +++ b/e2etest/get-testcases.py @@ -33,6 +33,7 @@ ]} ecs_matrix = {"testcase": [], "launch_type": ["EC2", "FARGATE"]} eks_matrix = {"testcase": []} + eks_arm64_matrix = {"testcase": []} eks_fargate_matrix = {"testcase": []} eks_adot_operator_matrix = {"testcase": []} local_matrix = {"testcase": []} @@ -45,6 +46,7 @@ "ec2_matrix_3": ec2_matrix_3, "ecs_matrix": ecs_matrix, "eks_matrix": eks_matrix, + "eks_arm64_matrix": eks_arm64_matrix, "eks_fargate_matrix": eks_fargate_matrix, "eks_adot_operator_matrix": eks_adot_operator_matrix, "local_matrix": local_matrix, @@ -63,6 +65,8 @@ ecs_matrix["testcase"].append(testcase["case_name"]) if 'EKS' in testcase["platforms"]: eks_matrix["testcase"].append(testcase["case_name"]) + if 'EKS_ARM64' in testcase["platforms"]: + eks_arm64_matrix["testcase"].append(testcase["case_name"]) if 'EKS_FARGATE' in testcase["platforms"]: eks_fargate_matrix["testcase"].append(testcase["case_name"]) if 'EKS_ADOT_OPERATOR' in testcase["platforms"]: diff --git a/e2etest/testcases.json b/e2etest/testcases.json index c6c8698807..43999ee439 100644 --- a/e2etest/testcases.json +++ b/e2etest/testcases.json @@ -1,7 +1,7 @@ [ { "case_name": "xrayreceiver", - "platforms": ["EC2", "ECS", "EKS", "CANARY"] + "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64", "CANARY"] }, { "case_name": "xrayreceiver_mock", @@ -13,15 +13,15 @@ }, { "case_name": "statsd", - "platforms": ["EC2", "ECS", "EKS"] + "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64"] }, { "case_name": "statsd_mock", - "platforms": ["LOCAL", "EC2", "ECS", "EKS", "PERF"] + "platforms": ["LOCAL", "EC2", "ECS", "EKS", "EKS_ARM64", "PERF"] }, { "case_name": "otlp_metric", - "platforms": ["EC2", "ECS", "EKS", "CANARY"] + "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64", "CANARY"] }, { "case_name": "otlp_metric_mock", @@ -33,7 +33,7 @@ }, { "case_name": "otlp_trace", - "platforms": ["EC2", "ECS", "EKS", "CANARY"] + "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64", "CANARY"] }, { "case_name": "otlp_trace_adot_operator", @@ -49,7 +49,7 @@ }, { "case_name": "otlp_trace_resourcedetection_eks", - "platforms": ["EKS"] + "platforms": ["EKS", "EKS_ARM64"] }, { "case_name": "otlp_mock", @@ -65,47 +65,47 @@ }, { "case_name": "otlp_grpc_exporter_metric_mock", - "platforms": ["EC2", "ECS", "EKS", "LOCAL", "PERF", "CANARY"] + "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64", "LOCAL", "PERF", "CANARY"] }, { "case_name": "otlp_grpc_exporter_trace_mock", - "platforms": ["EC2", "ECS", "EKS", "LOCAL", "PERF", "CANARY"] + "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64", "LOCAL", "PERF", "CANARY"] }, { "case_name": "otlp_http_exporter_metric_mock", - "platforms": ["EC2", "ECS", "EKS", "LOCAL", "PERF", "CANARY"] + "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64", "LOCAL", "PERF", "CANARY"] }, { "case_name": "otlp_http_exporter_trace_mock", - "platforms": ["EC2", "ECS", "EKS", "LOCAL", "PERF", "CANARY"] + "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64", "LOCAL", "PERF", "CANARY"] }, { "case_name": "sapm_exporter_trace_mock", - "platforms": ["EC2", "ECS", "EKS", "LOCAL", "PERF"] + "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64", "LOCAL", "PERF"] }, { "case_name": "signalfx_exporter_metric_mock", - "platforms": ["EC2", "ECS", "EKS", "LOCAL", "PERF"] + "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64", "LOCAL", "PERF"] }, { "case_name": "dynatrace_exporter_metric_mock", - "platforms": ["EC2", "ECS", "EKS", "LOCAL", "PERF"] + "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64", "LOCAL", "PERF"] }, { "case_name": "datadog_exporter_metric_mock", - "platforms": ["EC2", "ECS", "EKS", "LOCAL", "PERF"] + "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64", "LOCAL", "PERF"] }, { "case_name": "datadog_exporter_trace_mock", - "platforms": ["EC2", "ECS", "EKS", "LOCAL", "PERF"] + "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64", "LOCAL", "PERF"] }, { "case_name": "prometheus_mock", - "platforms": ["EC2", "ECS", "EKS", "LOCAL", "PERF"] + "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64", "LOCAL", "PERF"] }, { "case_name": "prometheus_static", - "platforms": ["EC2", "ECS", "EKS"] + "platforms": ["EC2", "ECS", "EKS", "EKS_ARM64"] }, { "case_name": "prometheus_static_adot_operator", @@ -113,7 +113,7 @@ }, { "case_name": "prometheus_sd", - "platforms": ["EKS"] + "platforms": ["EKS", "EKS_ARM64"] }, { "case_name": "prometheus_sd_adot_operator", @@ -125,19 +125,19 @@ }, { "case_name": "containerinsight_eks", - "platforms": ["EKS"] + "platforms": ["EKS", "EKS_ARM64"] }, { "case_name": "zipkin_mock", - "platforms": ["LOCAL", "EC2", "ECS", "EKS", "PERF"] + "platforms": ["LOCAL", "EC2", "ECS", "EKS", "EKS_ARM64", "PERF"] }, { "case_name": "jaeger_mock", - "platforms": ["LOCAL", "EC2", "ECS", "EKS", "PERF"] + "platforms": ["LOCAL", "EC2", "ECS", "EKS", "EKS_ARM64", "PERF"] }, { "case_name": "logzio_exporter_trace_mock", - "platforms": ["LOCAL", "EC2", "ECS", "EKS", "PERF"] + "platforms": ["LOCAL", "EC2", "ECS", "EKS", "EKS_ARM64", "PERF"] }, { "case_name": "ssm_package",