Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding EC2 OTEL Yaml Merging Config Integ Test #1391

Closed
wants to merge 13 commits into from
Closed

Adding EC2 OTEL Yaml Merging Config Integ Test #1391

Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5cd1f83
adding ec2 test for otel merging
Paramadon Oct 14, 2024
fbe9639
Adding yaml merging integration test
Paramadon Oct 15, 2024
21349fd
changing test repo branch name to test
Paramadon Oct 15, 2024
b344dbd
changing branch name back to main
Paramadon Oct 15, 2024
1f31aa4
making sure test still works
Paramadon Oct 16, 2024
f85359e
chaning test repo branch back to main
Paramadon Oct 16, 2024
67411fe
Merge branch 'main' of github.com:aws/amazon-cloudwatch-agent into ag…
Paramadon Oct 17, 2024
4dbd4a1
doing a git pull
Paramadon Oct 17, 2024
006cfe5
removing verifying terraform version
Paramadon Oct 17, 2024
99e397b
removing verifying terraform version
Paramadon Oct 17, 2024
943830e
removing terraform version check
Paramadon Oct 17, 2024
0b745c8
removing cache
Paramadon Oct 18, 2024
3a75a81
fixing ec2 linux test
Paramadon Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion .github/workflows/integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
ECR_INTEGRATION_TEST_REPO: "cwagent-integration-test"
CWA_GITHUB_TEST_REPO_NAME: "aws/amazon-cloudwatch-agent-test"
CWA_GITHUB_TEST_REPO_URL: "https://github.com/aws/amazon-cloudwatch-agent-test.git"
CWA_GITHUB_TEST_REPO_BRANCH: "main"
CWA_GITHUB_TEST_REPO_BRANCH: "agentOtelYamlMerging"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs to be main right?

TERRAFORM_AWS_ASSUME_ROLE_ITAR: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE_ITAR }}
S3_INTEGRATION_BUCKET_ITAR: ${{ vars.S3_INTEGRATION_BUCKET_ITAR }}
TERRAFORM_AWS_ASSUME_ROLE_CN: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE_CN }}
Expand Down Expand Up @@ -64,6 +64,7 @@ jobs:
outputs:
ec2_gpu_matrix: ${{ steps.set-matrix.outputs.ec2_gpu_matrix }}
ec2_linux_matrix: ${{ steps.set-matrix.outputs.ec2_linux_matrix }}
ec2_otel_merging: ${{ steps.set-matrix.outputs.ec2_otel_merging }}
ec2_windows_matrix: ${{ steps.set-matrix.outputs.ec2_windows_matrix }}
ec2_mac_matrix: ${{ steps.set-matrix.outputs.ec2_mac_matrix }}
ec2_performance_matrix: ${{steps.set-matrix.outputs.ec2_performance_matrix}}
Expand Down Expand Up @@ -95,6 +96,7 @@ jobs:
echo "::set-output name=ec2_gpu_matrix::$(echo $(cat generator/resources/ec2_gpu_complete_test_matrix.json))"
echo "::set-output name=eks_addon_matrix::$(echo $(cat generator/resources/eks_addon_complete_test_matrix.json))"
echo "::set-output name=ec2_linux_matrix::$(echo $(cat generator/resources/ec2_linux_complete_test_matrix.json))"
echo "::set-output name=ec2_otel_merging::$(echo $(cat generator/resources/ec2_otel_merging_complete_test_matrix.json))"
echo "::set-output name=ec2_windows_matrix::$(echo $(cat generator/resources/ec2_windows_complete_test_matrix.json))"
echo "::set-output name=ec2_mac_matrix::$(echo $(cat generator/resources/ec2_mac_complete_test_matrix.json))"
echo "::set-output name=ec2_performance_matrix::$(echo $(cat generator/resources/ec2_performance_complete_test_matrix.json))"
Expand All @@ -113,6 +115,7 @@ jobs:
echo "ec2_gpu_matrix: ${{ steps.set-matrix.outputs.ec2_gpu_matrix }}"
echo "eks_addon_matrix: ${{ steps.set-matrix.outputs.eks_addon_matrix }}"
echo "ec2_linux_matrix: ${{ steps.set-matrix.outputs.ec2_linux_matrix }}"
echo "ec2_otel_merging: ${{ steps.set-matrix.outputs.ec2_otel_merging }}"
echo "ec2_windows_matrix: ${{ steps.set-matrix.outputs.ec2_windows_matrix }}"
echo "ec2_mac_matrix: ${{ steps.set-matrix.outputs.ec2_mac_matrix }}"
echo "ec2_performance_matrix: ${{ steps.set-matrix.outputs.ec2_performance_matrix}}"
Expand Down Expand Up @@ -385,6 +388,24 @@ jobs:
s3_integration_bucket: ${{ vars.S3_INTEGRATION_BUCKET }}
secrets: inherit

EC2OtelMerging:
needs: [ StartLocalStack, GenerateTestMatrix, OutputEnvVariables ]
name: 'EC2OtelMerging'
uses: ./.github/workflows/ec2-integration-test.yml
with:
github_sha: ${{github.sha}}
test_dir: terraform/ec2/linux
job_id: ec2-linux-integration-test
test_props: ${{needs.GenerateTestMatrix.outputs.ec2_otel_merging}}
test_repo_name: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_NAME }}
test_repo_url: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_URL }}
test_repo_branch: ${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_BRANCH }}
localstack_host: ${{needs.StartLocalStack.outputs.local_stack_host_name}}
region: us-west-2
terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
s3_integration_bucket: ${{ vars.S3_INTEGRATION_BUCKET }}
secrets: inherit

EC2LinuxIntegrationTestITAR:
needs: [ StartLocalStackITAR, GenerateTestMatrix, OutputEnvVariables ]
name: 'EC2LinuxITAR'
Expand Down
Loading