mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-09 14:06:58 +02:00
Merge pull request #350 from crawford/ami_json
scripts/oem/ami: output AMI list in JSON format
This commit is contained in:
commit
b92afcccb3
@ -75,9 +75,10 @@ done
|
||||
upload_file() {
|
||||
local name="$1"
|
||||
local content="$2"
|
||||
url="$GS_URL/$GROUP/boards/$BOARD/$VER/${IMAGE}_${name}.txt"
|
||||
python -W "ignore:Not using mpz_powm_sec" \
|
||||
`which gsutil` cp - "$url" <<<"$content"
|
||||
url="$GS_URL/$GROUP/boards/$BOARD/$VER/${IMAGE}_${name}"
|
||||
echo -e "$content" \
|
||||
| python -W "ignore:Not using mpz_powm_sec" \
|
||||
`which gsutil` cp - "$url"
|
||||
echo "OK, ${url}=${content}"
|
||||
}
|
||||
|
||||
@ -106,10 +107,10 @@ publish_ami() {
|
||||
|
||||
# compatibility name from before addition of hvm
|
||||
if [[ "${virt_type}" == "pv" ]]; then
|
||||
upload_file "$r" "$r_amiid"
|
||||
upload_file "${r}.txt" "$r_amiid"
|
||||
fi
|
||||
|
||||
upload_file "${virt_type}_${r}" "$r_amiid"
|
||||
upload_file "${virt_type}_${r}.txt" "$r_amiid"
|
||||
}
|
||||
|
||||
WAIT_PIDS=()
|
||||
@ -129,6 +130,17 @@ for r in "${!HVM_AMIS[@]}"; do
|
||||
done
|
||||
HVM_ALL="${HVM_ALL#|}"
|
||||
|
||||
AMI_ALL="\"amis\": ["
|
||||
for r in "${ALL_REGIONS[@]}"; do
|
||||
AMI_ALL+="\n {"
|
||||
AMI_ALL+="\n \"name\": \"${r}\","
|
||||
AMI_ALL+="\n \"pv\": \"${AMIS[$r]}\","
|
||||
AMI_ALL+="\n \"hvm\": \"${HVM_AMIS[$r]}\""
|
||||
AMI_ALL+="\n },"
|
||||
done
|
||||
AMI_ALL="${AMI_ALL%,}"
|
||||
AMI_ALL+="\n]"
|
||||
|
||||
# wait for each subshell individually to report errors
|
||||
WAIT_FAILED=0
|
||||
for wait_pid in "${WAIT_PIDS[@]}"; do
|
||||
@ -142,7 +154,8 @@ if [[ ${WAIT_FAILED} -ne 0 ]]; then
|
||||
exit ${WAIT_FAILED}
|
||||
fi
|
||||
|
||||
upload_file "all" "${PV_ALL}"
|
||||
upload_file "pv" "${PV_ALL}"
|
||||
upload_file "hvm" "${HVM_ALL}"
|
||||
upload_file "all.txt" "${PV_ALL}"
|
||||
upload_file "pv.txt" "${PV_ALL}"
|
||||
upload_file "hvm.txt" "${HVM_ALL}"
|
||||
upload_file "all.json" "${AMI_ALL}"
|
||||
echo "Done"
|
||||
|
Loading…
Reference in New Issue
Block a user