Beautify createAMI.sh scripts

pull/797/head
pabloFuente 2023-03-16 13:14:05 +01:00
parent 81d561d1a0
commit 38ee33db27
2 changed files with 47 additions and 52 deletions

View File

@ -10,7 +10,6 @@ fi
export AWS_DEFAULT_REGION=eu-west-1 export AWS_DEFAULT_REGION=eu-west-1
DATESTAMP=$(date +%s) DATESTAMP=$(date +%s)
TEMPJSON=$(mktemp -t cloudformation-XXX --suffix .json) TEMPJSON=$(mktemp -t cloudformation-XXX --suffix .json)
@ -22,8 +21,8 @@ getUbuntuAmiId() {
local AMI_ID=$( local AMI_ID=$(
aws --region ${1} ec2 describe-images \ aws --region ${1} ec2 describe-images \
--filters "Name=name,Values=*ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*" \ --filters "Name=name,Values=*ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*" \
--query "sort_by(Images, &CreationDate)" \ --query "sort_by(Images, &CreationDate)" |
| jq -r 'del(.[] | select(.ImageOwnerAlias != null)) | .[-1].ImageId' jq -r 'del(.[] | select(.ImageOwnerAlias != null)) | .[-1].ImageId'
) )
echo $AMI_ID echo $AMI_ID
} }
@ -94,8 +93,7 @@ aws cloudformation delete-stack --stack-name openvidu-ce-${DATESTAMP}
# Unfortunately, aws cli does not have a way to increase timeout # Unfortunately, aws cli does not have a way to increase timeout
WAIT_RETRIES=0 WAIT_RETRIES=0
WAIT_MAX_RETRIES=3 WAIT_MAX_RETRIES=3
until [ "${WAIT_RETRIES}" -ge "${WAIT_MAX_RETRIES}" ] until [ "${WAIT_RETRIES}" -ge "${WAIT_MAX_RETRIES}" ]; do
do
aws ec2 wait image-available --image-ids ${OV_RAW_AMI_ID} && break aws ec2 wait image-available --image-ids ${OV_RAW_AMI_ID} && break
WAIT_RETRIES=$((WAIT_RETRIES + 1)) WAIT_RETRIES=$((WAIT_RETRIES + 1))
sleep 5 sleep 5

View File

@ -20,8 +20,8 @@ getUbuntuAmiId() {
local AMI_ID=$( local AMI_ID=$(
aws --region ${1} ec2 describe-images \ aws --region ${1} ec2 describe-images \
--filters "Name=name,Values=*ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*" \ --filters "Name=name,Values=*ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*" \
--query "sort_by(Images, &CreationDate)" \ --query "sort_by(Images, &CreationDate)" |
| jq -r 'del(.[] | select(.ImageOwnerAlias != null)) | .[-1].ImageId' jq -r 'del(.[] | select(.ImageOwnerAlias != null)) | .[-1].ImageId'
) )
echo $AMI_ID echo $AMI_ID
} }
@ -103,8 +103,7 @@ aws cloudformation delete-stack --stack-name kms-${DATESTAMP}
# Unfortunately, aws cli does not have a way to increase timeout # Unfortunately, aws cli does not have a way to increase timeout
WAIT_RETRIES=0 WAIT_RETRIES=0
WAIT_MAX_RETRIES=3 WAIT_MAX_RETRIES=3
until [ "${WAIT_RETRIES}" -ge "${WAIT_MAX_RETRIES}" ] until [ "${WAIT_RETRIES}" -ge "${WAIT_MAX_RETRIES}" ]; do
do
aws ec2 wait image-available --image-ids ${KMS_RAW_AMI_ID} && break aws ec2 wait image-available --image-ids ${KMS_RAW_AMI_ID} && break
WAIT_RETRIES=$((WAIT_RETRIES + 1)) WAIT_RETRIES=$((WAIT_RETRIES + 1))
sleep 5 sleep 5
@ -164,8 +163,7 @@ aws cloudformation delete-stack --stack-name openvidu-${DATESTAMP}
# Unfortunately, aws cli does not have a way to increase timeout # Unfortunately, aws cli does not have a way to increase timeout
WAIT_RETRIES=0 WAIT_RETRIES=0
WAIT_MAX_RETRIES=3 WAIT_MAX_RETRIES=3
until [ "${WAIT_RETRIES}" -ge "${WAIT_MAX_RETRIES}" ] until [ "${WAIT_RETRIES}" -ge "${WAIT_MAX_RETRIES}" ]; do
do
aws ec2 wait image-available --image-ids ${OV_RAW_AMI_ID} && break aws ec2 wait image-available --image-ids ${OV_RAW_AMI_ID} && break
WAIT_RETRIES=$((WAIT_RETRIES + 1)) WAIT_RETRIES=$((WAIT_RETRIES + 1))
sleep 5 sleep 5
@ -178,7 +176,6 @@ if [[ $CF_RELEASE == "true" ]]; then
aws ec2 modify-snapshot-attribute --snapshot-id ${SNAPSHOT_ID} --create-volume-permission "Add=[{Group=all}]" aws ec2 modify-snapshot-attribute --snapshot-id ${SNAPSHOT_ID} --create-volume-permission "Add=[{Group=all}]"
fi fi
# Updating the template # Updating the template
sed "s/OV_AMI_ID/${OV_RAW_AMI_ID}/" cfn-openvidu-server-pro-no-market.yaml.template >cfn-openvidu-server-pro-no-market-${OPENVIDU_PRO_VERSION}.yaml sed "s/OV_AMI_ID/${OV_RAW_AMI_ID}/" cfn-openvidu-server-pro-no-market.yaml.template >cfn-openvidu-server-pro-no-market-${OPENVIDU_PRO_VERSION}.yaml
sed -i "s/KMS_AMI_ID/${KMS_RAW_AMI_ID}/g" cfn-openvidu-server-pro-no-market-${OPENVIDU_PRO_VERSION}.yaml sed -i "s/KMS_AMI_ID/${KMS_RAW_AMI_ID}/g" cfn-openvidu-server-pro-no-market-${OPENVIDU_PRO_VERSION}.yaml