From c1de15c87b878747be92c55e799d6a373cb49f76 Mon Sep 17 00:00:00 2001 From: Andrei Aaron Date: Thu, 9 Feb 2023 14:28:01 +0200 Subject: [PATCH] ci: Revert "test: show the execution times of the tests (#1163)" (#1186) Exit code was not corrctly handled because of the pipes/tee, so the job would not fail if tests were failing. Reverting this for now. This reverts commit 74013a71afa925a1c897f4e371fd4a2deacc8cc7. Signed-off-by: Andrei Aaron --- Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 8ec8d9da..fbf63aa4 100644 --- a/Makefile +++ b/Makefile @@ -79,14 +79,12 @@ exporter-minimal: modcheck build-metadata .PHONY: test test: check-skopeo $(TESTDATA) $(NOTATION) $(ORAS) - rm -rf go_test.out - go test -failfast -tags $(EXTENSIONS),containers_image_openpgp -v -trimpath -race -timeout 15m -cover -coverpkg ./... -coverprofile=coverage-extended.txt -covermode=atomic ./... | tee -a go_test.out - go test -failfast -tags containers_image_openpgp -v -trimpath -race -cover -coverpkg ./... -coverprofile=coverage-minimal.txt -covermode=atomic ./... | tee -a go_test.out + go test -failfast -tags $(EXTENSIONS),containers_image_openpgp -v -trimpath -race -timeout 15m -cover -coverpkg ./... -coverprofile=coverage-extended.txt -covermode=atomic ./... + go test -failfast -tags containers_image_openpgp -v -trimpath -race -cover -coverpkg ./... -coverprofile=coverage-minimal.txt -covermode=atomic ./... # development-mode unit tests possibly using failure injection - go test -failfast -tags dev,$(EXTENSIONS),containers_image_openpgp -v -trimpath -race -timeout 15m -cover -coverpkg ./... -coverprofile=coverage-dev-extended.txt -covermode=atomic ./pkg/test/... ./pkg/api/... ./pkg/storage/... ./pkg/extensions/sync/... -run ^TestInject | tee -a go_test.out - go test -failfast -tags dev,containers_image_openpgp -v -trimpath -race -cover -coverpkg ./... -coverprofile=coverage-dev-minimal.txt -covermode=atomic ./pkg/test/... ./pkg/storage/... ./pkg/extensions/sync/... -run ^TestInject | tee -a go_test.out - go test -failfast -tags stress,$(EXTENSIONS),containers_image_openpgp -v -trimpath -race -timeout 15m ./pkg/cli/stress_test.go | tee -a go_test.out - cat go_test.out | grep -E '(^(--- |=== )| zotregistry.io/zot)' + go test -failfast -tags dev,$(EXTENSIONS),containers_image_openpgp -v -trimpath -race -timeout 15m -cover -coverpkg ./... -coverprofile=coverage-dev-extended.txt -covermode=atomic ./pkg/test/... ./pkg/api/... ./pkg/storage/... ./pkg/extensions/sync/... -run ^TestInject + go test -failfast -tags dev,containers_image_openpgp -v -trimpath -race -cover -coverpkg ./... -coverprofile=coverage-dev-minimal.txt -covermode=atomic ./pkg/test/... ./pkg/storage/... ./pkg/extensions/sync/... -run ^TestInject + go test -failfast -tags stress,$(EXTENSIONS),containers_image_openpgp -v -trimpath -race -timeout 15m ./pkg/cli/stress_test.go .PHONY: privileged-test privileged-test: check-skopeo $(TESTDATA) $(NOTATION)