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

SELinux Integration Test #1550

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
Open

SELinux Integration Test #1550

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9e9bf43
changing test repo branch
Paramadon Jan 15, 2025
c32d8ca
Merge branch 'main' of github.com:aws/amazon-cloudwatch-agent
Paramadon Jan 17, 2025
df9f77f
Merge branch 'main' of github.com:aws/amazon-cloudwatch-agent
Paramadon Jan 21, 2025
31b5358
removing caching
Paramadon Jan 27, 2025
67be248
Seperating Selinux test
Paramadon Jan 30, 2025
f9038b8
fixing syntax
Paramadon Jan 30, 2025
e7ad35f
passing in bool
Paramadon Jan 31, 2025
d1e896b
fixing test
Paramadon Jan 31, 2025
ef10e75
removing unnecessary tests
Paramadon Jan 31, 2025
080e9e9
Fixing test matrix for selinux
Paramadon Feb 10, 2025
83eb01c
fixing matrix
Paramadon Feb 10, 2025
94357a6
fixing naming
Paramadon Feb 10, 2025
c2bc195
pulling from main
Paramadon Feb 11, 2025
85bb800
fixing some changes
Paramadon Feb 11, 2025
d8be560
fixing matrix
Paramadon Feb 11, 2025
8f7de74
Merge branch 'main' into newSelinuxTest
Paramadon Feb 13, 2025
34accd2
adding selinux branch
Paramadon Feb 14, 2025
0fe13f8
Merge branch 'newSelinuxTest' of github.com:aws/amazon-cloudwatch-age…
Paramadon Feb 14, 2025
a74de15
removing terraform destroy temporarily so we can test out selinux_neg…
Paramadon Feb 16, 2025
4955c16
Merge branch 'main' of github.com:aws/amazon-cloudwatch-agent into ne…
Paramadon Feb 17, 2025
66245a7
adding back terraform destroy
Paramadon Feb 17, 2025
32855bd
Merging Selinux and ec2linux workflows
Paramadon Feb 17, 2025
031a69a
fixing complete_linux.json
Paramadon Feb 17, 2025
f665a76
fixing complete_linux.json
Paramadon Feb 17, 2025
70fce7c
adding bool
Paramadon Feb 17, 2025
c96d828
fixing input name
Paramadon Feb 17, 2025
a7e7b18
fixing terraform apply
Paramadon Feb 18, 2025
3687e66
Merge branch 'main' into newSelinuxTest
Paramadon Mar 11, 2025
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
4 changes: 4 additions & 0 deletions .github/workflows/ec2-integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ on:
type: string
terraform_assume_role:
type: string
is_selinux_test:
type: bool
s3_integration_bucket:
type: string

Expand Down Expand Up @@ -95,6 +97,8 @@ jobs:
-var="ssh_key_value=${{env.PRIVATE_KEY}}" \
-var="github_test_repo=${{ inputs.test_repo_url }}" \
-var="test_name=${{ matrix.arrays.os }}" \
-var="is_selinux_test=${{ inputs.is_selinux_test }} \
-var="selinux_branch=${{ matrix.arrays.selinux_branch }} \
-var="cwa_github_sha=${{inputs.github_sha}}" \
-var="install_agent=${{ matrix.arrays.installAgentCommand }}" \
-var="github_test_repo_branch=${{inputs.test_repo_branch}}" \
Expand Down
25 changes: 24 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: "selinuxTest"
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_selinux_matrix: ${{ steps.set-matrix.outputs.ec2_selinux_matrix }}
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_selinux_matrix::$(echo $(cat generator/resources/ec2_selinux_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_selinux_matrix: ${{ steps.set-matrix.outputs.ec2_selinux_matrix }}"
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 @@ -371,6 +374,26 @@ jobs:
region: us-west-2
terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
s3_integration_bucket: ${{ vars.S3_INTEGRATION_BUCKET }}
is_selinux_test: false
secrets: inherit

EC2SELinuxIntegrationTest:
needs: [ StartLocalStack, GenerateTestMatrix, OutputEnvVariables ]
name: 'EC2SELinux'
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_selinux_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 }}
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 }}
is_selinux_test: true
secrets: inherit

EC2LinuxIntegrationTestITAR:
Expand Down
Loading