X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fjob-cost.sh;h=85096cdd0e4798beb9c8b890e3da3237a84307f4;hb=refs%2Ftags%2Fv0.86.0;hp=4648a9538de91381f312a5a1762526a60726cafa;hpb=f1965ead65dbec24eafddcd6e59c793406a4c099;p=releng%2Fglobal-jjb.git diff --git a/shell/job-cost.sh b/shell/job-cost.sh index 4648a953..85096cdd 100644 --- a/shell/job-cost.sh +++ b/shell/job-cost.sh @@ -25,8 +25,8 @@ fi # AWS job cost not supported, exit 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 + echo "INFO: Not able to calculate job cost on AWS" + exit 0 fi lf-activate-venv zipp==1.1.0 python-openstackclient @@ -76,7 +76,7 @@ else fi # Archive the cost date -mkdir -p "$WORKSPACE/archives/cost" +mkdir -p "${WORKSPACE}/archives/cost" echo "INFO: Archiving Costs" @@ -85,5 +85,5 @@ echo "INFO: Archiving Costs" date=$(TZ=GMT date +'%Y-%m-%d %H:%M:%S') # Format the uptime, cost & stack_cost fields -printf "%s,%s,%s,%s,%d,%.2f,%.2f\n" "$JOB_NAME" "$BUILD_NUMBER" "$date" \ - "$resource" "$uptime" "$cost" "$stack_cost" > "$WORKSPACE/archives/cost.csv" +printf "%s,%s,%s,%s,%d,%.2f,%.2f,%s\n" "${JOB_NAME:-}" "${BUILD_NUMBER:-}" "$date" \ + "$resource" "$uptime" "$cost" "$stack_cost" "${BUILD_RESULT:-}" > "${WORKSPACE}/archives/cost.csv"