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
Typo jason -> json
[releng/global-jjb.git]
/
shell
/
job-cost.sh
diff --git
a/shell/job-cost.sh
b/shell/job-cost.sh
index
2264728
..
5bd61be
100644
(file)
--- a/
shell/job-cost.sh
+++ b/
shell/job-cost.sh
@@
-29,7
+29,7
@@
fi
if [[ -f stack-cost ]]; then
echo "DEBUG: $(cat stack-cost)"
echo "INFO: Retrieving Stack Cost..."
if [[ -f stack-cost ]]; then
echo "DEBUG: $(cat stack-cost)"
echo "INFO: Retrieving Stack Cost..."
- if ! stack_cost=$(
fgrep
"total: " stack-cost | awk '{print $2}'); then
+ if ! stack_cost=$(
grep -F
"total: " stack-cost | awk '{print $2}'); then
echo "ERROR: Unable to retrieve Stack Cost, continuing anyway"
stack_cost=0
fi
echo "ERROR: Unable to retrieve Stack Cost, continuing anyway"
stack_cost=0
fi
@@
-39,7
+39,7
@@
else
fi
# Retrieve the current uptime (in seconds)
fi
# Retrieve the current uptime (in seconds)
-uptime=$(
cat /proc/uptime | awk '{print $1}'
)
+uptime=$(
awk '{print $1}' /proc/uptime
)
# Convert to integer by truncating fractional part' and round up by one
((uptime=${uptime%\.*}+1))
# Convert to integer by truncating fractional part' and round up by one
((uptime=${uptime%\.*}+1))
@@
-47,13
+47,13
@@
instance_type=$(curl -s http://169.254.169.254/latest/meta-data/instance-type)
echo "INFO: Retrieving Pricing Info for: $instance_type"
url="https://pricing.vexxhost.net/v1/pricing/$instance_type/cost?seconds=$uptime"
echo "INFO: Retrieving Pricing Info for: $instance_type"
url="https://pricing.vexxhost.net/v1/pricing/$instance_type/cost?seconds=$uptime"
-j
ason_block=$(curl -s $url
)
+j
son_block=$(curl -s "$url"
)
-cost=$(jq .cost <<<
$jason_block
)
-resource=$(jq .resource <<<
$jason_block
| tr -d '"')
+cost=$(jq .cost <<<
"$json_block"
)
+resource=$(jq .resource <<<
"$json_block"
| tr -d '"')
# Archive the cost date
# Archive the cost date
-mkdir -p
$WORKSPACE/archives/cost
+mkdir -p
"$WORKSPACE/archives/cost"
echo "INFO: Archiving Costs"
echo "INFO: Archiving Costs"
@@
-61,7
+61,7
@@
echo "INFO: Archiving Costs"
# This format is readable by spreadsheet and is easily sortable
date=$(TZ=GMT date +'%Y-%m-%d %H:%M:%S')
# This format is readable by spreadsheet and is easily sortable
date=$(TZ=GMT date +'%Y-%m-%d %H:%M:%S')
-cat << EOF >
$WORKSPACE/archives/cost.csv
+cat << EOF >
"$WORKSPACE/archives/cost.csv"
$JOB_NAME,$BUILD_NUMBER,$date,$resource,$uptime,$cost,$stack_cost
EOF
$JOB_NAME,$BUILD_NUMBER,$date,$resource,$uptime,$cost,$stack_cost
EOF