Add OnPrem test back #635
+145
−277
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,26 @@ | ||
| [ | ||
| { | ||
| "os": "ubuntu-25", | ||
| "username": "ubuntu", | ||
| "instanceType":"t3a.medium", | ||
| "installAgentCommand": "go run ./install/install_agent.go deb", | ||
| "ami": "cloudwatch-agent-integration-test-ubuntu-25*", | ||
| "caCertPath": "/etc/ssl/certs/ca-certificates.crt", | ||
| "arc": "amd64", | ||
| "binaryName": "amazon-cloudwatch-agent.deb", | ||
| "family": "linux", | ||
| "agentStartCommand": "sudo /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a fetch-config -m onPremise -s -c " | ||
| }, | ||
| { | ||
| "os": "debian-12", | ||
| "username": "admin", | ||
| "instanceType": "c6g.large", | ||
| "installAgentCommand": "go run ./install/install_agent.go deb", | ||
| "ami": "cloudwatch-agent-integration-test-debian-12-arm64*", | ||
| "caCertPath": "/etc/ssl/certs/ca-certificates.crt", | ||
| "arc": "arm64", | ||
| "binaryName": "amazon-cloudwatch-agent.deb", | ||
| "family": "linux", | ||
| "agentStartCommand": "sudo /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a fetch-config -m onPremise -s -c " | ||
| } | ||
| ] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,6 +37,12 @@ locals { | |
| binary_uri = var.is_canary ? "${var.s3_bucket}/release/amazon_linux/${var.arc}/latest/${var.binary_name}" : "${var.s3_bucket}/integration-test/binary/${var.cwa_github_sha}/linux/${var.arc}/${var.binary_name}" | ||
| // list of test that require instance reboot | ||
| reboot_required_tests = tolist(["./test/restart"]) | ||
|
|
||
| // On-premises specific configuration | ||
| is_onprem = var.is_onprem | ||
|
|
||
| // Pre-test setup command | ||
| pre_test_setup_cmd = local.is_onprem ? "echo 'Pre-test setup: Replacing {instance_id} and $${aws:InstanceId} placeholders in test resource configs'; find . -path '*/resources/*.json' -exec sed -i 's/{instance_id}/${module.linux_common.cwagent_id}/g' {} \\; -exec sed -i 's/$${aws:InstanceId}/${module.linux_common.cwagent_id}/g' {} \\; && echo 'Updated all config files in resources directories'" : var.pre_test_setup | ||
| } | ||
|
|
||
| ##################################################################### | ||
|
|
@@ -53,24 +59,54 @@ resource "null_resource" "integration_test_setup" { | |
|
|
||
| # Prepare Integration Test | ||
| provisioner "remote-exec" { | ||
| inline = concat( | ||
| [ | ||
| "echo sha ${var.cwa_github_sha}", | ||
| "sudo cloud-init status --wait", | ||
| "echo clone ${var.github_test_repo} branch ${var.github_test_repo_branch} and install agent", | ||
| # check for vendor directory specifically instead of overall test repo to avoid issues with SELinux | ||
| "if [ ! -d amazon-cloudwatch-agent-test/vendor ]; then", | ||
| "echo 'Vendor directory (test repo dependencies) not found, cloning...'", | ||
| "sudo rm -r amazon-cloudwatch-agent-test", | ||
| "git clone --branch ${var.github_test_repo_branch} ${var.github_test_repo} -q", | ||
| "else", | ||
| "echo 'Test repo already exists, skipping clone'", | ||
| "fi", | ||
| "cd amazon-cloudwatch-agent-test", | ||
| "git rev-parse --short HEAD", | ||
| "aws s3 cp --no-progress s3://${local.binary_uri} .", | ||
| "export PATH=$PATH:/snap/bin:/usr/local/go/bin", | ||
| ], | ||
|
|
||
| # On-premises specific setup | ||
| local.is_onprem ? [ | ||
| "sudo mkdir -p ~/.aws", | ||
| "echo creating credentials file that the agent uses by default for onprem", | ||
| "printf '[default]\\nregion = us-west-2\\n' | sudo tee ~/.aws/config", | ||
| "echo attempting to assume role for on-premises credentials", | ||
| "ASSUME_ROLE_OUTPUT=$(aws sts assume-role --role-arn ${module.linux_common.cwa_onprem_assumed_iam_role_arm} --role-session-name onpremtest --query 'Credentials.[AccessKeyId,SecretAccessKey,SessionToken]' --output text)", | ||
| "if [ $? -ne 0 ]; then echo 'Failed to assume role'; exit 1; fi", | ||
| "echo 'Creating default credentials'", | ||
| "printf '[default]\\naws_access_key_id=%s\\naws_secret_access_key=%s\\naws_session_token=%s\\n' $ASSUME_ROLE_OUTPUT | sudo tee ~/.aws/credentials>/dev/null", | ||
| "echo verifying credentials are working", | ||
| "aws sts get-caller-identity || echo 'Credentials test failed'", | ||
| "echo turning off imds access in order to make agent start with onprem mode", | ||
| "aws ec2 modify-instance-metadata-options --instance-id ${module.linux_common.cwagent_id} --http-endpoint disabled", | ||
| "echo waiting for IMDS to be fully disabled", | ||
| "sleep 10", | ||
| "sudo mkdir -p /opt/aws/amazon-cloudwatch-agent/etc", | ||
| "printf '[credentials]\\n shared_credential_profile = \"default\"\\n shared_credential_file = \"/home/${var.user}/.aws/credentials\"\\n' | sudo tee /opt/aws/amazon-cloudwatch-agent/etc/common-config.toml>/dev/null", | ||
| "echo setting environment variables for agent", | ||
| "echo 'RUN_IN_AWS=false' | sudo tee -a /opt/aws/amazon-cloudwatch-agent/etc/env-config", | ||
| "echo 'INSTANCE_ID=${module.linux_common.cwagent_id}' | sudo tee -a /opt/aws/amazon-cloudwatch-agent/etc/env-config", | ||
| "echo 'export RUN_IN_AWS=false' | sudo tee -a /etc/environment", | ||
| "echo 'export INSTANCE_ID=${module.linux_common.cwagent_id}' | sudo tee -a /etc/environment", | ||
| ] : [], | ||
|
|
||
| [ | ||
| var.install_agent, | ||
| ] | ||
| ) | ||
| } | ||
|
|
||
| depends_on = [ | ||
|
|
@@ -128,11 +164,12 @@ resource "null_resource" "integration_test_run" { | |
| inline = concat( | ||
| [ | ||
| "echo Preparing environment...", | ||
| "nohup bash -c 'while true; do sudo shutdown -c; sleep 30; done' >/dev/null 2>&1 &", | ||
| ], | ||
|
|
||
| # SELinux test setup (if enabled) | ||
| var.is_selinux_test ? [ | ||
| "sudo yum install amazon-cloudwatch-agent -y", | ||
|
Contributor
There was a problem hiding this comment. This is kind of weird to me: why are we installing the agent from yum when we should be installing a local build?
Contributor
Author
There was a problem hiding this comment. This is to revert the previous change which I think it's wrong 54bceae#diff-7bd8f9f5e97c6da06e4bf19f9af808f0b39d6034c15800262f0f6300d7fced06R129-R135
Contributor
There was a problem hiding this comment. created an internal ticket to track fixing this |
||
| "echo Running SELinux test setup...", | ||
| "sudo yum install selinux-policy selinux-policy-targeted policycoreutils-python-utils selinux-policy-devel -y", | ||
| "sudo setenforce 1", | ||
|
|
@@ -153,14 +190,40 @@ resource "null_resource" "integration_test_run" { | |
| "export LOCAL_STACK_HOST_NAME=${var.local_stack_host_name}", | ||
| "export AWS_REGION=${var.region}", | ||
| "export PATH=$PATH:/snap/bin:/usr/local/go/bin", | ||
| ], | ||
|
|
||
| [ | ||
| "echo Running integration test...", | ||
| "cd ~/amazon-cloudwatch-agent-test", | ||
| ], | ||
|
|
||
| # On-premises specific environment variables | ||
| local.is_onprem ? [ | ||
| "export RUN_IN_AWS=false", | ||
| "export AWS_EC2_METADATA_DISABLED=true", | ||
| "export AWS_PROFILE=default", | ||
| "export AWS_SHARED_CREDENTIALS_FILE=~/.aws/credentials", | ||
| "export AWS_CONFIG_FILE=~/.aws/config", | ||
| "echo 'Environment variables for on-premises test:'", | ||
| "echo 'AWS_REGION='$AWS_REGION", | ||
| "echo 'RUN_IN_AWS='$RUN_IN_AWS", | ||
| "echo 'AWS_EC2_METADATA_DISABLED='$AWS_EC2_METADATA_DISABLED", | ||
| "echo 'AWS_PROFILE='$AWS_PROFILE", | ||
| "echo 'Instance ID parameter: ${module.linux_common.cwagent_id}'", | ||
| "echo 'Testing AWS credentials:'", | ||
| "aws sts get-caller-identity || echo 'AWS credentials test failed'", | ||
| "echo 'Testing agent credentials:'", | ||
| "sudo aws sts get-caller-identity || echo 'Agent credentials test failed'", | ||
| "echo 'Pre-test setup: Replacing {instance_id} and $${aws:InstanceId} placeholders in test resource configs'; find . -path '${var.test_dir}/resources/*.json' -exec sed -i 's/{instance_id}/${module.linux_common.cwagent_id}/g' {} \\; -exec sed -i 's/$${aws:InstanceId}/${module.linux_common.cwagent_id}/g' {} \\; && echo 'Updated all config files in resources directories'" | ||
| ] : [ | ||
| "echo Running sanity test...", | ||
| "go test ./test/sanity -p 1 -v", | ||
| ], | ||
|
|
||
| [ | ||
| var.pre_test_setup, | ||
| # Integration test execution with conditional agent start command | ||
| "go test ${var.test_dir} -p 1 -timeout 1h -computeType=EC2 -bucket=${var.s3_bucket} -plugins='${var.plugin_tests}' -excludedTests='${var.excluded_tests}' -cwaCommitSha=${var.cwa_github_sha} -caCertPath=${var.ca_cert_path} -proxyUrl=${module.linux_common.proxy_instance_proxy_ip} -instanceId=${module.linux_common.cwagent_id} ${local.is_onprem ? "-agentStartCommand='${var.agent_start}'" : ""} ${length(regexall("/amp", var.test_dir)) > 0 ? "-ampWorkspaceId=${module.amp[0].workspace_id} " : ""}-v" | ||
| ], | ||
| ) | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why is this using c6g.large but the ubuntu is using t3a.medium?