mirror of
https://github.com/inspec/inspec
synced 2024-11-26 14:40:26 +00:00
Clean up variable usage, and use download_s3_file
Signed-off-by: Miah Johnson <miah@chia-pet.org>
This commit is contained in:
parent
8d19c65eb1
commit
2a00b2b6a7
1 changed files with 8 additions and 8 deletions
|
@ -6,26 +6,26 @@ export LANG=C.UTF-8 LANGUAGE=C.UTF-8
|
|||
# test-reporter expects reporter identifier under this environment variable
|
||||
CC_TEST_REPORTER_ID="FIXME"
|
||||
TEST_REPORTER_VERSION="0.6.3"
|
||||
S3_URL="s3://public-cd-buildkite-cache/${BUILDKITE_PIPELINE_SLUG}/${BUILDKITE_LABEL}"
|
||||
S3_URL="s3://public-cd-buildkite-cache/$BUILDKITE_PIPELINE_SLUG/$BUILDKITE_LABEL"
|
||||
|
||||
download_test_reporter() {
|
||||
curl -o test-reporter -L https://codeclimate.com/downloads/test-reporter/test-reporter-"${TEST_REPORTER_VERSION}"-linux-amd64
|
||||
curl -o test-reporter -L https://codeclimate.com/downloads/test-reporter/test-reporter-"$TEST_REPORTER_VERSION"-linux-amd64
|
||||
chmod +x test-reporter
|
||||
}
|
||||
|
||||
download_s3_file() {
|
||||
aws s3 cp "${S3_URL}/$1" "$1"
|
||||
aws s3 cp "$S3_URL/$1" "$1"
|
||||
}
|
||||
|
||||
upload_s3_file() {
|
||||
if [ -f "$1" ]; then
|
||||
aws s3 cp "$1" "${S3_URL}/$1" || echo "Could not push $1 to S3 for caching."
|
||||
aws s3 cp "$1" "$S3_URL/$1" || echo "Could not push $1 to S3 for caching."
|
||||
fi
|
||||
}
|
||||
|
||||
echo "--- downloading coverage tool"
|
||||
aws s3 cp "${S3_URL}/test-reporter" || download_test_reporter
|
||||
aws s3 cp "${S3_URL}/test-reporter.sha" || echo "Could not download test-reporter.sha"
|
||||
download_s3_file test-reporter || download_test_reporter
|
||||
download_s3_file test-reporter.sha || echo "Could not download test-reporter.sha"
|
||||
|
||||
|
||||
echo "--- updating rubygems"
|
||||
|
@ -47,9 +47,9 @@ bundle exec rake "${RAKE_TASK:-}"
|
|||
EXIT-CODE=$?
|
||||
|
||||
echo "+++ formatting and uploading test coverage"
|
||||
./test-reporter after-build -t simplecov --exit-code $EXIT_CODE
|
||||
./test-reporter after-build -t simplecov --exit-code "$EXIT_CODE"
|
||||
|
||||
echo "--- uploading test-reporter{.sha} to s3"
|
||||
echo "--- uploading test-reporter.sha to s3"
|
||||
if [ "test-reporter" -nt "test-reporter.sha" ]; then
|
||||
if shasum --check test-reporter.sha --status; then
|
||||
shasum -a 256 test-reporter > test-reporter.sha
|
||||
|
|
Loading…
Reference in a new issue