From 32d2cb52bcc0016f6be9c069c2d5a2d57666a59c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20S=CC=8Ctibrany=CC=81?= Date: Mon, 13 Jul 2020 17:12:31 +0200 Subject: [PATCH 1/2] Add cover tool to build-image. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Štibraný --- build-image/Dockerfile | 3 ++- tools/test | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build-image/Dockerfile b/build-image/Dockerfile index 46924b067f8..aa12ffad834 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -20,7 +20,8 @@ RUN GO111MODULE=on go get -tags netgo \ github.com/client9/misspell/cmd/misspell@v0.3.4 \ github.com/golang/protobuf/protoc-gen-go@v1.3.1 \ github.com/gogo/protobuf/protoc-gen-gogoslick@v1.3.0 \ - github.com/gogo/protobuf/gogoproto@v1.3.0 && \ + github.com/gogo/protobuf/gogoproto@v1.3.0 \ + github.com/weaveworks/tools/cover@bdd647e92546027e12cdde3ae0714bb495e43013 && \ rm -rf /go/pkg /go/src ENV KUBEVAL_VERSION=0.15.0 diff --git a/tools/test b/tools/test index 214c30417c9..bea0d3f17cd 100755 --- a/tools/test +++ b/tools/test @@ -134,9 +134,6 @@ if [ -n "$PARALLEL" ]; then fi if [ -n "$SLOW" ] && [ -z "$COVERDIR" ]; then - go get github.com/weaveworks/tools/cover - go mod vendor # re-vendor everything - cover "$coverdir"/* >profile.cov rm -rf "$coverdir" go tool cover -html=profile.cov -o=coverage.html From be49edf8e4e271cbf2c3870f159cd85438fafb30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20S=CC=8Ctibrany=CC=81?= Date: Mon, 13 Jul 2020 17:29:13 +0200 Subject: [PATCH 2/2] Update build image. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Štibraný --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2dd197d9b97..eef19f48b08 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ defaults: &defaults docker: # IMPORTANT: whenever you change the build-image version tag, remember to replace it # across the entire file (there are multiple references). - - image: quay.io/cortexproject/build-image:update-build-image-ce3bc5f86 + - image: quay.io/cortexproject/build-image:with-cover-32d2cb52b working_directory: /go/src/github.com/cortexproject/cortex filters: &filters @@ -87,7 +87,7 @@ jobs: test: docker: - - image: quay.io/cortexproject/build-image:update-build-image-ce3bc5f86 + - image: quay.io/cortexproject/build-image:with-cover-32d2cb52b - image: cassandra:3.11 environment: JVM_OPTS: "-Xms1024M -Xmx1024M" @@ -111,7 +111,7 @@ jobs: name: Integration Test command: | touch build-image/.uptodate - MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations make BUILD_IMAGE=quay.io/cortexproject/build-image:update-build-image-ce3bc5f86 configs-integration-test + MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations make BUILD_IMAGE=quay.io/cortexproject/build-image:with-cover-32d2cb52b configs-integration-test integration: machine: