Skip to content

Fix get_instance_type #495

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

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Fix get_instance_type #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion e2e2/test/images/nvidia/gpu_unit_tests/bash_unit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ skip() {
local message=${1:-}
notify_test_skipped "$__bash_unit_current_test__" "$message"
echo "skipped $message" > $__bash_unit_test_skipped__
exit 1
exit 0
}

_notify_trace() {
Expand Down
14 changes: 2 additions & 12 deletions e2e2/test/images/nvidia/gpu_unit_tests/tests/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,12 @@ get_instance_type()
# Retrieve instance metadata: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instancedata-data-retrieval.html#instance-metadata-retrieval-examples
[ -n "$FORCE_INSTANCE_TYPE" ] && echo $FORCE_INSTANCE_TYPE

local token=$(curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600")
local token_exit_code=$?
local token=$(curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600" 2>/dev/null)

if [ $token_exit_code -eq 0 ]; then
echo "Token retrieved successfully, retrieving instance type using the token..."
if [ -n "$token" ]; then
curl -H "X-aws-ec2-metadata-token: $token" http://169.254.169.254/latest/meta-data/instance-type
local instance_type_exit_code=$?
else
echo "Failed to retrieve instance metadata token. Falling back to direct instance type retrieval."
curl http://169.254.169.254/latest/meta-data/instance-type
local instance_type_exit_code=$?
fi

if [ $instance_type_exit_code -ne 0 ]; then
echo "Failed to retrieve instance type." >&2
return 1
fi
}

Expand Down
Loading