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.

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

Implement JMX E2E Tests in Testing Workflow #1463

Open
wants to merge 83 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 73 commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
92eeb56
added e2e-build
okankoAMZ Nov 7, 2024
4ec8d1e
resolved deadlock
okankoAMZ Nov 7, 2024
ec8a6fa
turned off build agent for testing
okankoAMZ Nov 7, 2024
a722179
skip testing flag
okankoAMZ Nov 8, 2024
07ff0ca
refractoring
okankoAMZ Nov 8, 2024
3efdcff
Merge branch 'main' into e2c-build-workflow
okankoAMZ Nov 8, 2024
535f12e
Update .github/workflows/e2e-build.yml
okankoAMZ Nov 11, 2024
edb81da
Merge remote-tracking branch 'origin/e2c-build-workflow' into e2e
musa-asad Nov 30, 2024
762c0a7
Add E2E workflows.
musa-asad Dec 1, 2024
ff14103
Push workflow.
musa-asad Dec 1, 2024
adf6e6d
Merge build and test for e2e.
musa-asad Dec 1, 2024
93cfb18
Fix env.
musa-asad Dec 1, 2024
0f2562c
Fix env again.
musa-asad Dec 1, 2024
390e64b
Fix call.
musa-asad Dec 1, 2024
0d8561e
Fix split.
musa-asad Dec 1, 2024
3518c73
Use sha.
musa-asad Dec 1, 2024
d62a739
Remove concurrency.
musa-asad Dec 1, 2024
56126d2
Add concurrency back and use parent.
musa-asad Dec 1, 2024
78595cd
Fix variables and remove terraform destroy.
musa-asad Dec 1, 2024
1cb8048
Remove push.
musa-asad Dec 1, 2024
a4111dc
Fix operator.
musa-asad Dec 2, 2024
59e069f
Remove job.
musa-asad Dec 2, 2024
ffb985d
Add jmx testing.
musa-asad Dec 2, 2024
8b26d93
Update branch.
musa-asad Dec 2, 2024
2bad825
Add destroy.
musa-asad Dec 2, 2024
00b7c2b
Add destroy.
musa-asad Dec 2, 2024
2b992e5
Merge branch 'main' into e2e
musa-asad Dec 4, 2024
d147b88
Merge branch 'main' into e2e
musa-asad Dec 5, 2024
08bbab6
Add flag for e2e test generation.
musa-asad Dec 8, 2024
c105517
Merge remote-tracking branch 'origin/e2e' into e2e-jmx
musa-asad Dec 8, 2024
ebdcdfd
Update branch for operator.
musa-asad Dec 8, 2024
b7d8671
Remove terraform destroy.
musa-asad Dec 8, 2024
52bfb87
Add TA.
musa-asad Dec 9, 2024
0157e62
Add kafka.
musa-asad Dec 9, 2024
02324c4
Add CI.
musa-asad Dec 10, 2024
d2a83a0
Double role duration.
musa-asad Dec 11, 2024
04396fb
Set hours to 4.
musa-asad Dec 11, 2024
99db29c
Update .github/workflows/e2e-test.yml
musa-asad Dec 12, 2024
fe0bc91
Update .github/workflows/e2e-test.yml
musa-asad Dec 12, 2024
d7a3a47
Merge branch 'e2e' into e2e-jmx
musa-asad Dec 12, 2024
3fc3545
Merge branch 'main' into e2e
musa-asad Dec 12, 2024
7952c5d
Pass in assume role.
musa-asad Dec 13, 2024
e28d022
Add reference.
musa-asad Dec 13, 2024
e174169
Use operator sha.
musa-asad Dec 13, 2024
669257b
Merge branch 'e2e' into e2e-jmx
musa-asad Dec 13, 2024
9ea6844
Add TA.
musa-asad Dec 13, 2024
d3c5ed1
Merge branch 'e2e' into e2e-jmx
musa-asad Dec 13, 2024
a3be947
Use main for operator workflow.
musa-asad Dec 13, 2024
c99f220
Merge branch 'e2e' into e2e-jmx
musa-asad Dec 13, 2024
78dcb48
Pass assume role.
musa-asad Dec 13, 2024
b367917
Add dependencies.
musa-asad Dec 13, 2024
ca83a9c
Make changes.
musa-asad Dec 13, 2024
187aff0
Make changes.
musa-asad Dec 13, 2024
f6ba2b6
Merge branch 'main' into e2e
musa-asad Dec 13, 2024
2a67460
Remove e2e-build.yml.
musa-asad Dec 13, 2024
2ea1b49
Merge branch 'e2e' into e2e-jmx
musa-asad Dec 13, 2024
fe9e5b4
Fix conditional.
musa-asad Dec 14, 2024
8b2d1f3
fix conditional.
musa-asad Dec 14, 2024
35e10d3
fix conditional
musa-asad Dec 14, 2024
4511475
Fix call.
musa-asad Dec 14, 2024
72f1380
Explicit.
musa-asad Dec 15, 2024
b9fdf81
Check empty string.
musa-asad Dec 15, 2024
8fed8d9
Add input to dispatch.
musa-asad Dec 15, 2024
0f9d359
Add input to dispatch.
musa-asad Dec 15, 2024
f6ec078
Merge branch 'e2e' into e2e-jmx
musa-asad Dec 16, 2024
442d6a7
Merge branch 'main' into e2e-jmx
musa-asad Dec 16, 2024
d6c0696
Pass option for node configuration.
musa-asad Dec 16, 2024
5cfcd07
Merge branch 'main' into e2e-jmx
musa-asad Dec 17, 2024
b9a571e
Remove MSI temporarily.
musa-asad Dec 17, 2024
0a7771a
Fix typo.
musa-asad Dec 17, 2024
adc5ba5
Ready for review
musa-asad Dec 17, 2024
48325f6
Merge branch 'main' into e2e-jmx
musa-asad Dec 17, 2024
8a3e6bc
Merge branch 'main' into e2e-jmx
musa-asad Dec 18, 2024
2c74c4f
change to app
musa-asad Dec 18, 2024
1acd3eb
remove -app
musa-asad Dec 19, 2024
2e8272c
fix naming
musa-asad Dec 20, 2024
eafe2bf
tmp
musa-asad Dec 20, 2024
f57b273
e2e-jmx branch
musa-asad Dec 20, 2024
dc346c1
Merge branch 'main' into e2e-jmx
musa-asad Dec 20, 2024
6f93d91
add upload
musa-asad Dec 22, 2024
6f83690
add to clean
musa-asad Dec 22, 2024
a2e33a4
ready
musa-asad Dec 22, 2024
b4ab00d
Merge branch 'main' into e2e-jmx
musa-asad Dec 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
68 changes: 67 additions & 1 deletion .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,4 +148,70 @@ jobs:

- name: Echo test plan matrix
run: |
echo "eks_e2e_matrix: ${{ steps.set-matrix.outputs.eks_e2e_matrix }}"
echo "eks_e2e_matrix: ${{ steps.set-matrix.outputs.eks_e2e_matrix }}"

EKSE2EJVMTomcatTest:
needs: [ GetLatestOperatorCommitSHA, GenerateTestMatrix, OutputEnvVariables ]
name: 'EKSE2EJVMTomcatTest'
uses: ./.github/workflows/eks-e2e-test.yml
with:
terraform_dir: terraform/eks/e2e
job_id: eks-e2e-jvm-tomcat-test
test_props: ${{ needs.GenerateTestMatrix.outputs.eks_e2e_matrix }}
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 }}
cloudwatch_agent_repository: ${{ needs.OutputEnvVariables.outputs.ECR_INTEGRATION_TEST_REPO }}
cloudwatch_agent_tag: ${{ github.sha }}
cloudwatch_agent_operator_repository: ${{ needs.OutputEnvVariables.outputs.ECR_OPERATOR_REPO }}
cloudwatch_agent_operator_tag: ${{ needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }}
region: ${{ inputs.region }}
helm_charts_branch: ${{ inputs.helm-charts-branch }}
terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
agent_config: resources/cwagent_configs/jvm_tomcat.json
sample_app: resources/sample_apps/tomcat-deployment.yaml
secrets: inherit

EKSE2EKafkaTest:
needs: [ GetLatestOperatorCommitSHA, GenerateTestMatrix, OutputEnvVariables ]
name: 'EKSE2EKafkaTest'
uses: ./.github/workflows/eks-e2e-test.yml
with:
terraform_dir: terraform/eks/e2e
job_id: eks-e2e-kafka-test
test_props: ${{ needs.GenerateTestMatrix.outputs.eks_e2e_matrix }}
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 }}
cloudwatch_agent_repository: ${{ needs.OutputEnvVariables.outputs.ECR_INTEGRATION_TEST_REPO }}
cloudwatch_agent_tag: ${{ github.sha }}
cloudwatch_agent_operator_repository: ${{ needs.OutputEnvVariables.outputs.ECR_OPERATOR_REPO }}
cloudwatch_agent_operator_tag: ${{ needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }}
region: ${{ inputs.region }}
helm_charts_branch: ${{ inputs.helm-charts-branch }}
terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
agent_config: resources/cwagent_configs/kafka.json
sample_app: resources/sample_apps/kafka-deployment.yaml
secrets: inherit

EKSE2EJMXContainerInsightsTest:
needs: [ GetLatestOperatorCommitSHA, GenerateTestMatrix, OutputEnvVariables ]
name: 'EKSE2EJMXContainerInsightsTest'
uses: ./.github/workflows/eks-e2e-test.yml
with:
terraform_dir: terraform/eks/e2e
job_id: eks-e2e-jmx-containerinsights-test
test_props: ${{ needs.GenerateTestMatrix.outputs.eks_e2e_matrix }}
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 }}
cloudwatch_agent_repository: ${{ needs.OutputEnvVariables.outputs.ECR_INTEGRATION_TEST_REPO }}
cloudwatch_agent_tag: ${{ github.sha }}
cloudwatch_agent_operator_repository: ${{ needs.OutputEnvVariables.outputs.ECR_OPERATOR_REPO }}
cloudwatch_agent_operator_tag: ${{ needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }}
region: ${{ inputs.region }}
helm_charts_branch: ${{ inputs.helm-charts-branch }}
terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
agent_config: resources/cwagent_configs/containerinsights.json
sample_app: resources/sample_apps/tomcat-deployment.yaml
secrets: inherit
1 change: 1 addition & 0 deletions .github/workflows/eks-e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ jobs:
if terraform apply --auto-approve \
-var="region=${{ inputs.region }}" \
-var="k8s_version=${{ matrix.arrays.k8s_version }}" \
-var="nodes=${{ matrix.arrays.nodes }}" \
-var="helm_charts_branch=${{ inputs.helm_charts_branch }}" \
-var="cloudwatch_agent_repository_url=${{ steps.login-ecr.outputs.registry }}" \
-var="cloudwatch_agent_repository=${{ inputs.cloudwatch_agent_repository }}" \
Expand Down
Loading