From: Zack Williams Date: Thu, 23 Jan 2020 18:42:17 +0000 (-0700) Subject: Error handling for job cost script X-Git-Tag: v0.51.0~17 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F23%2F62923%2F5;p=releng%2Fglobal-jjb.git Error handling for job cost script - Exit early if on AWS, where job cost calculation isn't supported - Error handling for vexhost API - may return a 404 which doesn't parse properly in jq, which would fails an otherwise working build. - Report correct name when script is run. Change-Id: I375b4a16588b1ab12e4aa7da0e37b351ed52f64c Signed-off-by: Zack Williams --- diff --git a/shell/job-cost.sh b/shell/job-cost.sh index 5bd61bee..34ab5e73 100644 --- a/shell/job-cost.sh +++ b/shell/job-cost.sh @@ -8,13 +8,19 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html ############################################################################## -echo "---> build-cost.sh" +echo "---> job-cost.sh" set -euf -o pipefail # shellcheck disable=SC1090 source ~/lf-env.sh +# AWS job cost not supported, exit +if grep -qi amazon /sys/devices/virtual/dmi/id/bios_vendor ; then + echo "INFO: Not able to calculate job cost on AWS" + exit 0 +fi + lf-activate-venv python-openstackclient if [[ -z ${JOB_NAME:-} ]]; then @@ -43,14 +49,24 @@ uptime=$(awk '{print $1}' /proc/uptime) # Convert to integer by truncating fractional part' and round up by one ((uptime=${uptime%\.*}+1)) +# EC2 and OpenStack have simiar instace metadata APIs at this IP +# AWS docs: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instancedata-data-retrieval.html +# Nova docs: https://docs.openstack.org/nova/latest/user/metadata.html 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" json_block=$(curl -s "$url") -cost=$(jq .cost <<< "$json_block") -resource=$(jq .resource <<< "$json_block" | tr -d '"') +# check if JSON returned and can be parsed +if jq <<< "$json_block"; then + cost=$(jq .cost <<< "$json_block") + resource=$(jq .resource <<< "$json_block" | tr -d '"') +else + echo "ERROR: Pricing API returned invalid json" + cost=0 + resource=0 +fi # Archive the cost date mkdir -p "$WORKSPACE/archives/cost" @@ -64,4 +80,3 @@ date=$(TZ=GMT date +'%Y-%m-%d %H:%M:%S') cat << EOF > "$WORKSPACE/archives/cost.csv" $JOB_NAME,$BUILD_NUMBER,$date,$resource,$uptime,$cost,$stack_cost EOF -