diff --git a/scripts/jenkins-report.sh b/scripts/jenkins-report.sh index daec599362..2a756bb692 100755 --- a/scripts/jenkins-report.sh +++ b/scripts/jenkins-report.sh @@ -1,43 +1,28 @@ #!/usr/bin/env bash set -e -# Note: this script is in a temporary state. In an effort to get the -# platform off of coveralls and onto codecov, we will be temporarily -# using both. In order to no longer use coveralls, a change must be -# made in https://github.com/edx/jenkins-job-dsl, as well as removing -# the coveralls block below +# This script generates coverage and diff cover reports, and optionally +# reports this data to codecov.io. The following environment variables must be +# set in order to report to codecov: +# CODE_COV_TOKEN: CodeCov API token +# CI_BRANCH: The branch that the coverage report describes # This script is used by the edx-platform-unit-coverage jenkins job. -if [ $# -eq 2 ]; then - COMMIT=$2 -else - echo "Incorrect number of arguments passed to this script!" - echo "Please supply the following values to this script:" - echo "1) git hash of the commit being tested" - echo "2) coveralls token" - exit 1 -fi - source scripts/jenkins-common.sh # Get the diff coverage and html reports for unit tests paver coverage -# Send the coverage data to codecov. The 'CODE_COV_TOKEN' should be -# available as an environment variable. -pip install codecov==2.0.5 -codecov --token=$CODE_COV_TOKEN - -# THIS BLOCK WILL BE REMOVED -# Send the coverage data to coveralls. Setting 'TRAVIS_BRANCH' allows the -# data to be sorted by branch in the coveralls UI. The branch is passed as -# a param to the coverage job on jenkins. -pip install coveralls==1.0 -COVERALLS_REPO_TOKEN=$1 TRAVIS_BRANCH=$COMMIT coveralls - -# Get coverage reports for bok choy -# paver bokchoy_coverage +# Test for the CodeCov API token +if [ -z $CODE_COV_TOKEN ]; then + echo "codecov.io API token not set." + echo "This must be set as an environment variable if order to report coverage" +else + # Send the coverage data to codecov + pip install codecov==2.0.5 + codecov --token=$CODE_COV_TOKEN --branch=$CI_BRANCH +fi # JUnit test reporter will fail the build # if it thinks test results are old