Skip to content

Commit

Permalink
Move coverage from travis to prow
Browse files Browse the repository at this point in the history
Also just call `bazel-build-verify` make target only as that does
everything we should need.

Signed-off-by: Daniel Hiller <daniel.hiller.1972@gmail.com>
  • Loading branch information
dhiller committed Aug 19, 2020
1 parent d8c0e2e commit 8ebe572
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ coverage:
hack/dockerized "./hack/coverage.sh ${WHAT}"

goveralls: go-build
SYNC_OUT=false hack/dockerized "TRAVIS_JOB_ID=${TRAVIS_JOB_ID} TRAVIS_PULL_REQUEST=${TRAVIS_PULL_REQUEST} TRAVIS_BRANCH=${TRAVIS_BRANCH} ./hack/goveralls.sh"
SYNC_OUT=false hack/dockerized "COVERALLS_TOKEN=${COVERALLS_TOKEN} CI_NAME=prow CI_BUILD_NUMBER=${BUILD_ID} CI_BRANCH=${PULL_BASE_REF} CI_PULL_REQUEST=${PULL_NUMBER} ./hack/goveralls.sh"

go-test: go-build
SYNC_OUT=false hack/dockerized "./hack/build-go.sh test ${WHAT}"
Expand Down
13 changes: 0 additions & 13 deletions automation/travisci-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,6 @@
# when not on a release do extensive checks
if [ -z "$TRAVIS_TAG" ]; then
make bazel-build-verify

# The make bazel-test might take longer then the current timeout for a command in Travis-CI of 10 min, so adding a keep alive loop while it runs
while sleep 9m; do echo "Long running job - keep alive"; done &
LOOP_PID=$!

if [[ $TRAVIS_REPO_SLUG == "kubevirt/kubevirt" && $TRAVIS_CPU_ARCH == "amd64" ]]; then
make goveralls
else
make bazel-test
fi

kill $LOOP_PID

else
make
fi
Expand Down
2 changes: 1 addition & 1 deletion hack/goveralls.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
set -e

./hack/coverage.sh
goveralls -service=travis-ci -coverprofile=.coverprofile -ignore=$(find -regextype posix-egrep -regex ".*generated_mock.*\.go|.*swagger_generated\.go|.*openapi_generated\.go" -printf "%P\n" | paste -d, -s)
goveralls -service=prow -coverprofile=.coverprofile -ignore=$(find -regextype posix-egrep -regex ".*generated_mock.*\.go|.*swagger_generated\.go|.*openapi_generated\.go" -printf "%P\n" | paste -d, -s)

0 comments on commit 8ebe572

Please sign in to comment.