Skip to content

Commit

Permalink
Refactoring test runs
Browse files Browse the repository at this point in the history
Signed-off-by: Roman Shaposhnik <rvs@zededa.com>
  • Loading branch information
rvs committed Jul 13, 2019
1 parent d046f0b commit 249b545
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
16 changes: 11 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
---
version: 2.1
jobs:
test:
machine:
image: circleci/classic:latest
steps:
- checkout
- run:
name: Test
command: make test
- store_test_results:
path: dist
build:
machine:
image: circleci/classic:latest
Expand All @@ -16,11 +26,6 @@ jobs:
- run:
name: Installing qemu-utils
command: sudo apt-get update; sudo apt-get install -y qemu-utils
- run:
name: Test
command: make test
- store_test_results:
path: dist
- run:
name: Packages
command: >
Expand Down Expand Up @@ -85,4 +90,5 @@ workflows:
build-stuff:
jobs:
- yetus
- test
- build
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ all: help

test: $(GOBUILDER) | $(DIST)
@echo Running tests on $(GOMODULE)
@$(DOCKER_GO) "go test -v ./... 2>&1 | go-junit-report" $(GOTREE) $(GOMODULE) | sed -e '1d' > $(DIST)/results.xml
@$(DOCKER_GO) "set -o pipefail ; go test -v ./... 2>&1 | go-junit-report | sed -e 1d" $(GOTREE) $(GOMODULE) > $(DIST)/results.xml

clean:
rm -rf $(DIST) pkg/pillar/Dockerfile pkg/qrexec-lib/Dockerfile pkg/qrexec-dom0/Dockerfile \
Expand Down

0 comments on commit 249b545

Please sign in to comment.