Skip to content

Commit 963ad10

Browse files
ParamadonParamadon
authored
Adding IPv6 e2e tests to test workflow (#1950)
1 parent 3fe9fa5 commit 963ad10

File tree

2 files changed

+166
-1
lines changed

2 files changed

+166
-1
lines changed

‎.github/workflows/e2e-test.yml‎

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,3 +299,158 @@ jobs:
299299
eks_installation_type: "EKS_ADDON"
300300
secrets: inherit
301301

302+
EKSE2EJVMTomcatTestHelmIPv6:
303+
needs: [ GetLatestOperatorCommitSHA, GenerateTestMatrix, OutputEnvVariables ]
304+
if: always() && !cancelled() && !contains(needs.*.result, 'failure')
305+
name: 'EKSE2EJVMTomcatTestHelmIPv6'
306+
uses: ./.github/workflows/eks-e2e-test.yml
307+
with:
308+
terraform_dir: terraform/eks/e2e
309+
job_id: eks-e2e-jvm-tomcat-test-helm-ipv6
310+
test_props: ${{ needs.GenerateTestMatrix.outputs.eks_e2e_jmx_matrix }}
311+
test_repo_name: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_NAME }}
312+
test_repo_url: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_URL }}
313+
test_repo_branch: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_BRANCH }}
314+
cloudwatch_agent_repository: ${{ needs.OutputEnvVariables.outputs.ECR_INTEGRATION_TEST_REPO }}
315+
cloudwatch_agent_tag: ${{ inputs.build_sha || github.sha }}
316+
cloudwatch_agent_operator_repository: ${{ needs.OutputEnvVariables.outputs.ECR_OPERATOR_REPO }}
317+
cloudwatch_agent_operator_tag: ${{ needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }}
318+
region: ${{ inputs.region || 'us-west-2' }}
319+
helm_charts_branch: ${{ inputs.helm-charts-branch || 'main' }}
320+
terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
321+
agent_config: resources/cwagent_configs_helm_chart/jvm_tomcat.json
322+
sample_app: resources/sample_apps/tomcat.yaml
323+
eks_installation_type: "HELM_CHART"
324+
ip_family: "ipv6"
325+
vpc_name: "ipv6-eks-integ-test/VPC"
326+
secrets: inherit
327+
328+
EKSE2EJVMTomcatTestAddonIPv6:
329+
needs: [ GetLatestOperatorCommitSHA, GenerateTestMatrix, OutputEnvVariables ]
330+
if: always() && !cancelled() && !contains(needs.*.result, 'failure')
331+
name: 'EKSE2EJVMTomcatTestAddonIPv6'
332+
uses: ./.github/workflows/eks-e2e-test.yml
333+
with:
334+
terraform_dir: terraform/eks/e2e
335+
job_id: eks-e2e-jvm-tomcat-test-addon-ipv6
336+
test_props: ${{ needs.GenerateTestMatrix.outputs.eks_e2e_jmx_matrix }}
337+
test_repo_name: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_NAME }}
338+
test_repo_url: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_URL }}
339+
test_repo_branch: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_BRANCH }}
340+
cloudwatch_agent_repository: ${{ needs.OutputEnvVariables.outputs.ECR_INTEGRATION_TEST_REPO }}
341+
cloudwatch_agent_tag: ${{ inputs.build_sha || github.sha }}
342+
cloudwatch_agent_operator_repository: ${{ needs.OutputEnvVariables.outputs.ECR_OPERATOR_REPO }}
343+
cloudwatch_agent_operator_tag: ${{ needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }}
344+
region: ${{ inputs.region || 'us-west-2' }}
345+
helm_charts_branch: ${{ inputs.helm-charts-branch || 'main' }}
346+
terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
347+
agent_config: resources/cwagent_configs_eks_addon/jvm_tomcat.json
348+
sample_app: resources/sample_apps/tomcat.yaml
349+
eks_installation_type: "EKS_ADDON"
350+
ip_family: "ipv6"
351+
vpc_name: "ipv6-eks-integ-test/VPC"
352+
secrets: inherit
353+
354+
EKSE2EKafkaTestHelmIPv6:
355+
needs: [ GetLatestOperatorCommitSHA, GenerateTestMatrix, OutputEnvVariables ]
356+
if: always() && !cancelled() && !contains(needs.*.result, 'failure')
357+
name: 'EKSE2EKafkaTestHelmIPv6'
358+
uses: ./.github/workflows/eks-e2e-test.yml
359+
with:
360+
terraform_dir: terraform/eks/e2e
361+
job_id: eks-e2e-kafka-test-helm-ipv6
362+
test_props: ${{ needs.GenerateTestMatrix.outputs.eks_e2e_jmx_matrix }}
363+
test_repo_name: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_NAME }}
364+
test_repo_url: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_URL }}
365+
test_repo_branch: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_BRANCH }}
366+
cloudwatch_agent_repository: ${{ needs.OutputEnvVariables.outputs.ECR_INTEGRATION_TEST_REPO }}
367+
cloudwatch_agent_tag: ${{ inputs.build_sha || github.sha }}
368+
cloudwatch_agent_operator_repository: ${{ needs.OutputEnvVariables.outputs.ECR_OPERATOR_REPO }}
369+
cloudwatch_agent_operator_tag: ${{ needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }}
370+
region: ${{ inputs.region || 'us-west-2' }}
371+
helm_charts_branch: ${{ inputs.helm-charts-branch || 'main' }}
372+
terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
373+
agent_config: resources/cwagent_configs_helm_chart/kafka.json
374+
sample_app: resources/sample_apps/kafka.yaml
375+
eks_installation_type: "HELM_CHART"
376+
ip_family: "ipv6"
377+
vpc_name: "ipv6-eks-integ-test/VPC"
378+
secrets: inherit
379+
380+
EKSE2EKafkaTestAddonIPv6:
381+
needs: [ GetLatestOperatorCommitSHA, GenerateTestMatrix, OutputEnvVariables ]
382+
if: always() && !cancelled() && !contains(needs.*.result, 'failure')
383+
name: 'EKSE2EKafkaTestAddonIPv6'
384+
uses: ./.github/workflows/eks-e2e-test.yml
385+
with:
386+
terraform_dir: terraform/eks/e2e
387+
job_id: eks-e2e-kafka-test-addon-ipv6
388+
test_props: ${{ needs.GenerateTestMatrix.outputs.eks_e2e_jmx_matrix }}
389+
test_repo_name: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_NAME }}
390+
test_repo_url: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_URL }}
391+
test_repo_branch: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_BRANCH }}
392+
cloudwatch_agent_repository: ${{ needs.OutputEnvVariables.outputs.ECR_INTEGRATION_TEST_REPO }}
393+
cloudwatch_agent_tag: ${{ inputs.build_sha || github.sha }}
394+
cloudwatch_agent_operator_repository: ${{ needs.OutputEnvVariables.outputs.ECR_OPERATOR_REPO }}
395+
cloudwatch_agent_operator_tag: ${{ needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }}
396+
region: ${{ inputs.region || 'us-west-2' }}
397+
helm_charts_branch: ${{ inputs.helm-charts-branch || 'main' }}
398+
terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
399+
agent_config: resources/cwagent_configs_eks_addon/kafka.json
400+
sample_app: resources/sample_apps/kafka.yaml
401+
eks_installation_type: "EKS_ADDON"
402+
ip_family: "ipv6"
403+
vpc_name: "ipv6-eks-integ-test/VPC"
404+
secrets: inherit
405+
406+
EKSE2EJMXContainerInsightsTestHelmIPv6:
407+
needs: [ GetLatestOperatorCommitSHA, GenerateTestMatrix, OutputEnvVariables ]
408+
if: always() && !cancelled() && !contains(needs.*.result, 'failure')
409+
name: 'EKSE2EJMXContainerInsightsTestHelmIPv6'
410+
uses: ./.github/workflows/eks-e2e-test.yml
411+
with:
412+
terraform_dir: terraform/eks/e2e
413+
job_id: eks-e2e-jmx-containerinsights-test-helm-ipv6
414+
test_props: ${{ needs.GenerateTestMatrix.outputs.eks_e2e_jmx_matrix }}
415+
test_repo_name: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_NAME }}
416+
test_repo_url: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_URL }}
417+
test_repo_branch: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_BRANCH }}
418+
cloudwatch_agent_repository: ${{ needs.OutputEnvVariables.outputs.ECR_INTEGRATION_TEST_REPO }}
419+
cloudwatch_agent_tag: ${{ inputs.build_sha || github.sha }}
420+
cloudwatch_agent_operator_repository: ${{ needs.OutputEnvVariables.outputs.ECR_OPERATOR_REPO }}
421+
cloudwatch_agent_operator_tag: ${{ needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }}
422+
region: ${{ inputs.region || 'us-west-2' }}
423+
helm_charts_branch: ${{ inputs.helm-charts-branch || 'main' }}
424+
terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
425+
agent_config: resources/cwagent_configs_helm_chart/containerinsights.json
426+
sample_app: resources/sample_apps/tomcat.yaml
427+
eks_installation_type: "HELM_CHART"
428+
ip_family: "ipv6"
429+
vpc_name: "ipv6-eks-integ-test/VPC"
430+
secrets: inherit
431+
432+
EKSE2EJMXContainerInsightsTestAddonIPv6:
433+
needs: [ GetLatestOperatorCommitSHA, GenerateTestMatrix, OutputEnvVariables ]
434+
if: always() && !cancelled() && !contains(needs.*.result, 'failure')
435+
name: 'EKSE2EJMXContainerInsightsTestAddonIPv6'
436+
uses: ./.github/workflows/eks-e2e-test.yml
437+
with:
438+
terraform_dir: terraform/eks/e2e
439+
job_id: eks-e2e-jmx-containerinsights-test-addon-ipv6
440+
test_props: ${{ needs.GenerateTestMatrix.outputs.eks_e2e_jmx_matrix }}
441+
test_repo_name: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_NAME }}
442+
test_repo_url: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_URL }}
443+
test_repo_branch: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_BRANCH }}
444+
cloudwatch_agent_repository: ${{ needs.OutputEnvVariables.outputs.ECR_INTEGRATION_TEST_REPO }}
445+
cloudwatch_agent_tag: ${{ inputs.build_sha || github.sha }}
446+
cloudwatch_agent_operator_repository: ${{ needs.OutputEnvVariables.outputs.ECR_OPERATOR_REPO }}
447+
cloudwatch_agent_operator_tag: ${{ needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }}
448+
region: ${{ inputs.region || 'us-west-2' }}
449+
helm_charts_branch: ${{ inputs.helm-charts-branch || 'main' }}
450+
terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
451+
agent_config: resources/cwagent_configs_eks_addon/containerinsights.json
452+
sample_app: resources/sample_apps/tomcat.yaml
453+
eks_installation_type: "EKS_ADDON"
454+
ip_family: "ipv6"
455+
vpc_name: "ipv6-eks-integ-test/VPC"
456+
secrets: inherit

‎.github/workflows/eks-e2e-test.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,14 @@ on:
6868
eks_installation_type:
6969
required: true
7070
type: string
71+
ip_family:
72+
required: false
73+
type: string
74+
default: "ipv4"
75+
vpc_name:
76+
required: false
77+
type: string
78+
default: ""
7179

7280
jobs:
7381
EKSE2ETest:
@@ -138,7 +146,9 @@ jobs:
138146
-var="prometheus_config=${{ inputs.prometheus_config }}" \
139147
-var="otel_config=${{ inputs.otel_config }}" \
140148
-var="sample_app=${{ inputs.sample_app }}" \
141-
-var="eks_installation_type=${{ inputs.eks_installation_type }}"; then
149+
-var="eks_installation_type=${{ inputs.eks_installation_type }}" \
150+
-var="ip_family=${{ inputs.ip_family }}" \
151+
-var="vpc_name=${{ inputs.vpc_name }}"; then
142152
terraform destroy --auto-approve
143153
else
144154
terraform destroy --auto-approve && exit 1

0 commit comments

Comments
 (0)