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

E2e test package separation #622

Merged
merged 12 commits into from
Oct 25, 2022
Merged

E2e test package separation #622

Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
da0be26
Fix generateTestMatrix workflow step
ChenaLee Oct 20, 2022
74d8427
Fix startlocalstack step
ChenaLee Oct 20, 2022
4da968d
Fix ec2linuxintegrationtest
ChenaLee Oct 21, 2022
5fc36a1
Fix stoplocalstack
ChenaLee Oct 21, 2022
766bebd
Fix MakeMSIZip
ChenaLee Oct 24, 2022
2f1f26c
Fix checkout repository argument
ChenaLee Oct 24, 2022
e564cc2
Fix MakeMacPkg
ChenaLee Oct 24, 2022
04d4cb7
Fix ECSFargateIntegrationTest
ChenaLee Oct 24, 2022
147178c
Fix EC2NvidiaGPUIntegrationTest
ChenaLee Oct 24, 2022
aa7b0fc
Fix PerformanceTrackingTest
ChenaLee Oct 24, 2022
832a2f2
Fix matrix generation invalid file path
ChenaLee Oct 25, 2022
80ad5a6
Use env variables for test repo name and url
ChenaLee Oct 25, 2022
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
86 changes: 52 additions & 34 deletions .github/workflows/integrationTest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ jobs:
ecs_fargate_matrix: ${{ steps.set-matrix.outputs.ecs_fargate_matrix }}
steps:
- uses: actions/checkout@v2
with:
repository: aws/amazon-cloudwatch-agent-test

- name: Set up Go 1.x
uses: actions/setup-go@v2
Expand All @@ -136,11 +138,11 @@ jobs:
- name: Generate matrix
id: set-matrix
run: |
go run --tags=generator integration/generator/test_case_generator.go
echo "::set-output name=ec2_gpu_matrix::$(echo $(cat integration/generator/resources/ec2_gpu_complete_test_matrix.json))"
echo "::set-output name=ec2_linux_matrix::$(echo $(cat integration/generator/resources/ec2_linux_complete_test_matrix.json))"
echo "::set-output name=ec2_performance_matrix::$(echo $(cat integration/generator/resources/ec2_performance_complete_test_matrix.json))"
echo "::set-output name=ecs_fargate_matrix::$(echo $(cat integration/generator/resources/ecs_fargate_complete_test_matrix.json))"
go run --tags=generator generator/test_case_generator.go
echo "::set-output name=ec2_gpu_matrix::$(echo $(cat generator/resources/ec2_gpu_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_performance_matrix::$(echo $(cat generator/resources/ec2_performance_complete_test_matrix.json))"
echo "::set-output name=ecs_fargate_matrix::$(echo $(cat generator/resources/ecs_fargate_complete_test_matrix.json))"

- name: Echo test plan matrix
run: |
Expand All @@ -158,6 +160,8 @@ jobs:
contents: read
steps:
- uses: actions/checkout@v2
with:
repository: aws/amazon-cloudwatch-agent-test
khanhntd marked this conversation as resolved.
Show resolved Hide resolved

- name: Set up Go 1.x
uses: actions/setup-go@v2
Expand Down Expand Up @@ -194,10 +198,10 @@ jobs:
export version=$(cat CWAGENT_VERSION)
echo cw agent version $version
mkdir msi_dep
cp -r integration/msi/tools/. msi_dep/
cp -r msi/tools/. msi_dep/
cp -r windows-agent/amazon-cloudwatch-agent/. msi_dep/
go run integration/msi/tools/msiversion/msiversionconverter.go $version msi_dep/amazon-cloudwatch-agent.wxs '<version>' --tags=integration
go run integration/msi/tools/msiversion/msiversionconverter.go $version msi_dep/manifest.json __VERSION__ --tags=integration
go run msi/tools/msiversion/msiversionconverter.go $version msi_dep/amazon-cloudwatch-agent.wxs '<version>' --tags=integration
go run msi/tools/msiversion/msiversionconverter.go $version msi_dep/manifest.json __VERSION__ --tags=integration

- name: Zip
if: steps.cached_win_zip.outputs.cache-hit != 'true'
Expand All @@ -218,6 +222,8 @@ jobs:
contents: read
steps:
- uses: actions/checkout@v2
with:
repository: aws/amazon-cloudwatch-agent-test

- name: Set up Go 1.x
uses: actions/setup-go@v2
Expand Down Expand Up @@ -247,8 +253,8 @@ jobs:
run: |
echo cw agent version $(cat CWAGENT_VERSION)
cp CWAGENT_VERSION /tmp/CWAGENT_VERSION
cp -r integration/pkg/tools/. /tmp/
cp -r integration/pkg/tools/. /tmp/arm64/
cp -r pkg/tools/. /tmp/
cp -r pkg/tools/. /tmp/arm64/
cp -r darwin/amd64/. /tmp/
cp -r darwin/arm64/. /tmp/arm64/

Expand Down Expand Up @@ -353,14 +359,16 @@ jobs:
runs-on: ubuntu-latest
defaults:
run:
working-directory: integration/terraform/ec2/localstack
working-directory: terraform/ec2/localstack
outputs:
local_stack_host_name: ${{ steps.localstack.outputs.local_stack_host_name }}
permissions:
id-token: write
contents: read
steps:
- uses: actions/checkout@v2
with:
repository: aws/amazon-cloudwatch-agent-test

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
Expand All @@ -380,8 +388,8 @@ jobs:
echo run terraform and execute test code &&
terraform apply --auto-approve
-var="ssh_key_value=${PRIVATE_KEY}"
-var="github_repo=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git"
-var="github_sha=${GITHUB_SHA}"
-var="github_test_repo=https://github.com/aws/amazon-cloudwatch-agent-test.git"
-var="cwa_github_sha=${GITHUB_SHA}"
-var="s3_bucket=${S3_INTEGRATION_BUCKET}"
-var="ssh_key_name=${KEY_NAME}" &&
LOCAL_STACK_HOST_NAME=$(terraform output -raw public_dns) &&
Expand All @@ -402,6 +410,8 @@ jobs:
contents: read
steps:
- uses: actions/checkout@v2
with:
repository: aws/amazon-cloudwatch-agent-test

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
Expand Down Expand Up @@ -431,11 +441,11 @@ jobs:
timeout_minutes: 30
retry_wait_seconds: 5
command: |
cd integration/terraform/ec2/linux
cd terraform/ec2/linux
terraform init
if terraform apply --auto-approve \
-var="ssh_key_value=${PRIVATE_KEY}" -var="github_repo=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git" \
-var="github_sha=${GITHUB_SHA}" -var="install_agent=${{ matrix.arrays.installAgentCommand }}" \
-var="ssh_key_value=${PRIVATE_KEY}" -var="github_test_repo=https://github.com/aws/amazon-cloudwatch-agent-test.git" \
-var="cwa_github_sha=${GITHUB_SHA}" -var="install_agent=${{ matrix.arrays.installAgentCommand }}" \
-var="ec2_instance_type=${{ matrix.arrays.instanceType }}" \
-var="user=${{ matrix.arrays.username }}" \
-var="ami=${{ matrix.arrays.ami }}" \
Expand All @@ -459,12 +469,12 @@ jobs:
timeout_minutes: 30
retry_wait_seconds: 5
command: |
cd integration/terraform/ec2/win
cd terraform/ec2/win
terraform init
if terraform apply --auto-approve \
-var="ssh_key_value=${PRIVATE_KEY}" -var="ssh_key_name=${KEY_NAME}" \
-var="github_repo=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git" \
-var="github_sha=${GITHUB_SHA}" -var="ami=${{ matrix.arrays.ami }}" \
-var="github_repo=aws/amazon-cloudwatch-agent-test.git" \
-var="cwa_github_sha=${GITHUB_SHA}" -var="ami=${{ matrix.arrays.ami }}" \
-var="test_dir=${{ matrix.arrays.test_dir }}" \
-var="ec2_instance_type=${{ matrix.arrays.instanceType }}" \
-var="s3_bucket=${S3_INTEGRATION_BUCKET}" ; then terraform destroy -auto-approve
Expand All @@ -482,9 +492,9 @@ jobs:
retry_wait_seconds: 5
command: |
if "${{ matrix.arrays.os }}" == window
cd integration/terraform/ec2/win
cd terraform/ec2/win
else
cd integration/terraform/ec2/linux
cd terraform/ec2/linux
fi
terraform destroy --auto-approve

Expand All @@ -501,6 +511,8 @@ jobs:
contents: read
steps:
- uses: actions/checkout@v2
with:
repository: aws/amazon-cloudwatch-agent-test

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
Expand Down Expand Up @@ -530,11 +542,11 @@ jobs:
timeout_minutes: 30
retry_wait_seconds: 5
command: |
cd integration/terraform/ec2/linux
cd terraform/ec2/linux
terraform init
if terraform apply --auto-approve \
-var="ssh_key_value=${PRIVATE_KEY}" -var="github_repo=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git" \
-var="github_sha=${GITHUB_SHA}" -var="install_agent=${{ matrix.arrays.installAgentCommand }}" \
-var="ssh_key_value=${PRIVATE_KEY}" -var="github_test_repo=https://github.com/aws/amazon-cloudwatch-agent-test.git" \
-var="cwa_github_sha=${GITHUB_SHA}" -var="install_agent=${{ matrix.arrays.installAgentCommand }}" \
-var="ec2_instance_type=${{ matrix.arrays.instanceType }}" \
-var="user=${{ matrix.arrays.username }}" \
-var="ami=${{ matrix.arrays.ami }}" \
Expand All @@ -558,7 +570,7 @@ jobs:
max_attempts: 3
timeout_minutes: 8
retry_wait_seconds: 5
command: cd integration/terraform/ec2/linux && terraform destroy --auto-approve
command: cd terraform/ec2/linux && terraform destroy --auto-approve

# @TODO add back when we add back windows tests
# EC2WinIntegrationTest:
Expand Down Expand Up @@ -608,7 +620,7 @@ jobs:
# if terraform apply --auto-approve \
# -var="ssh_key_value=${PRIVATE_KEY}" -var="ssh_key_name=${KEY_NAME}" \
# -var="github_repo=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git" \
# -var="github_sha=${GITHUB_SHA}" -var="ami=${{ matrix.arrays.ami }}" \
# -var="cwa_github_sha=${GITHUB_SHA}" -var="ami=${{ matrix.arrays.ami }}" \
# -var="test_dir=${{ matrix.arrays.test_dir }}" \
# -var="s3_bucket=${S3_INTEGRATION_BUCKET}" ; then
# terraform destroy -auto-approve
Expand All @@ -634,12 +646,14 @@ jobs:
needs: [ StartLocalStack, EC2LinuxIntegrationTest ]
defaults:
run:
working-directory: integration/terraform/ec2/localstack
working-directory: terraform/ec2/localstack
permissions:
id-token: write
contents: read
steps:
- uses: actions/checkout@v2
with:
repository: aws/amazon-cloudwatch-agent-test

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
Expand Down Expand Up @@ -672,6 +686,8 @@ jobs:
contents: read
steps:
- uses: actions/checkout@v2
with:
repository: aws/amazon-cloudwatch-agent-test

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
Expand Down Expand Up @@ -703,7 +719,7 @@ jobs:
timeout_minutes: 15
retry_wait_seconds: 5
command: |
cd integration/terraform/ecs/linux
cd terraform/ecs/linux
terraform init
if terraform apply --auto-approve -var="test_dir=${{ matrix.arrays.test_dir }}" -var="cwagent_image_repo=${{ steps.login-ecr.outputs.registry }}/${{ env.ECR_INTEGRATION_TEST_REPO }}" -var="cwagent_image_tag=${{ github.sha }}" ; then
terraform destroy -auto-approve
Expand All @@ -718,7 +734,7 @@ jobs:
max_attempts: 3
timeout_minutes: 8
retry_wait_seconds: 5
command: cd integration/terraform/ecs/linux && terraform destroy --auto-approve
command: cd terraform/ecs/linux && terraform destroy --auto-approve

PerformanceTrackingTest:
name: "PerformanceTrackingTest"
Expand All @@ -733,6 +749,8 @@ jobs:
contents: read
steps:
- uses: actions/checkout@v2
with:
repository: aws/amazon-cloudwatch-agent-test

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
Expand Down Expand Up @@ -767,11 +785,11 @@ jobs:
timeout_minutes: 30
retry_wait_seconds: 5
command: |
cd integration/terraform/ec2/linux
cd terraform/ec2/linux
terraform init
if terraform apply --auto-approve \
-var="ssh_key_value=${PRIVATE_KEY}" -var="github_repo=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git" \
-var="github_sha=${GITHUB_SHA}" -var="install_agent=${{ matrix.arrays.installAgentCommand }}" \
-var="ssh_key_value=${PRIVATE_KEY}" -var="github_test_repo=https://github.com/aws/amazon-cloudwatch-agent-test.git" \
khanhntd marked this conversation as resolved.
Show resolved Hide resolved
-var="cwa_github_sha=${GITHUB_SHA}" -var="install_agent=${{ matrix.arrays.installAgentCommand }}" \
-var="user=${{ matrix.arrays.username }}" \
-var="ami=${{ matrix.arrays.ami }}" \
-var="ca_cert_path=${{ matrix.arrays.caCertPath }}" \
Expand All @@ -780,7 +798,7 @@ jobs:
-var="local_stack_host_name=${{ needs.StartLocalStack.outputs.local_stack_host_name }}" \
-var="s3_bucket=${S3_INTEGRATION_BUCKET}" \
-var="ssh_key_name=${KEY_NAME}" \
-var="github_sha_date=${{ steps.sha_date.outputs.sha_date }}" \
-var="cwa_github_sha_date=${{ steps.sha_date.outputs.sha_date }}" \
-var="test_name=${{ matrix.arrays.os }}" \
-var="performance_number_of_logs=${{ matrix.arrays.performance_number_of_logs}}"\
-var="test_dir=${{ matrix.arrays.test_dir }}" ; then terraform destroy -auto-approve
Expand All @@ -796,4 +814,4 @@ jobs:
max_attempts: 3
timeout_minutes: 8
retry_wait_seconds: 5
command: cd integration/terraform/ec2/linux && terraform destroy --auto-approve
command: cd terraform/ec2/linux && terraform destroy --auto-approve