From 91e27b5e9e010350def3bdbe77ac8b2c2bf555a5 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 17 Jul 2023 07:50:58 +0100 Subject: [PATCH] separate the instance type determination from the _OS check Signed-off-by: Davanum Srinivas --- hack/make-rules/test-e2e-node.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh index 3be9a733b..653ef73f9 100755 --- a/hack/make-rules/test-e2e-node.sh +++ b/hack/make-rules/test-e2e-node.sh @@ -32,8 +32,10 @@ fi build_eks_ami=${BUILD_EKS_AMI:-"false"} if [[ ${build_eks_ami} != "false" ]]; then instance_type=${INSTANCE_TYPE:-"m6a.large"} - if [[ ${BUILD_EKS_AMI_OS:-""} == "al2023" ]]; then + if [[ ${BUILD_EKS_AMI_ARCH:-""} == "arm64" ]]; then instance_type=${INSTANCE_TYPE:-"m6g.large"} + fi + if [[ ${BUILD_EKS_AMI_OS:-""} == "al2023" ]]; then ami_id=$(aws ec2 describe-images --region=us-east-1 --filters Name=name,Values=amazon-eks-${build_eks_arch}node-al2023-${KUBE_MINOR_VERSION}-v${TODAYS_DATE} --query 'Images[*].[ImageId]' --output text) else ami_id=$(aws ec2 describe-images --region=us-east-1 --filters Name=name,Values=amazon-eks-${build_eks_arch}node-${KUBE_MINOR_VERSION}-v${TODAYS_DATE} --query 'Images[*].[ImageId]' --output text)