Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update the version of prettier being used
[releng/global-jjb.git]
/
shell
/
job-cost.sh
diff --git
a/shell/job-cost.sh
b/shell/job-cost.sh
index
a7dceea
..
595b342
100644
(file)
--- a/
shell/job-cost.sh
+++ b/
shell/job-cost.sh
@@
-16,7
+16,8
@@
set -euf -o pipefail
source ~/lf-env.sh
# AWS job cost not supported, exit
source ~/lf-env.sh
# AWS job cost not supported, exit
-if grep -qi amazon /sys/devices/virtual/dmi/id/bios_vendor ; then
+cloudtype="$(jq -r .v1.datasource /run/cloud-init/result.json)"
+if [[ $cloudtype == "DataSourceEc2Local" ]]; then
echo "INFO: Not able to calculate job cost on AWS"
exit 0
fi
echo "INFO: Not able to calculate job cost on AWS"
exit 0
fi
@@
-59,7
+60,7
@@
url="https://pricing.vexxhost.net/v1/pricing/$instance_type/cost?seconds=$uptime
json_block=$(curl -s "$url")
# check if JSON returned and can be parsed
json_block=$(curl -s "$url")
# check if JSON returned and can be parsed
-if jq <<< "$json_block" > /dev/null 2>&1; then
+if jq
.
<<< "$json_block" > /dev/null 2>&1; then
cost=$(jq .cost <<< "$json_block")
resource=$(jq .resource <<< "$json_block" | tr -d '"')
else
cost=$(jq .cost <<< "$json_block")
resource=$(jq .resource <<< "$json_block" | tr -d '"')
else