Skip to content
Snippets Groups Projects
Verified Commit 6b98897c authored by Levente Polyak's avatar Levente Polyak :rocket:
Browse files

chore(make): use podman by default

parent 21bdc4ea
No related branches found
No related tags found
No related merge requests found
......@@ -8,14 +8,14 @@ lint:
test:
script:
- pacman -Syu --needed --noconfirm podman make
- make test DOCKER=podman
- make test
tags:
- vm
code-coverage:
script:
- pacman -Syu --needed --noconfirm podman make jq
- make test-coverage DOCKER=podman 2>/dev/null
- make test-coverage 2>/dev/null
- "echo \"Percent coverage: $(jq -r .percent_covered coverage/bats.*/coverage.json)%\""
tags:
- vm
......
......@@ -4,7 +4,7 @@ RUN_OPTIONS:=--rm --network=$(NETWORK) -v $(PWD):/dbscripts:ro --tmpfs=/tmp:exec
CASES ?= cases
JOBS ?= $(shell nproc)
BATS_ARGS ?= --jobs $(JOBS) --verbose-run
DOCKER ?= docker
DOCKER ?= podman
test-image:
$(DOCKER) build --pull -t $(IMAGE) test
......
......@@ -56,8 +56,8 @@ Things that haven't been mentioned yet:
- `cron-jobs/sourceballs`
## Testing
* Install the `make` and `podman` or `docker` packages depending on your
preferrence. The default expects docker but pomdan can be used if
`DOCKER=podman` is specified. When using docker, start the docker daemon by
preferrence. The default expects podman but docker can be used if
`DOCKER=docker` is specified. When using docker, start the docker daemon by
issuing `systemctl start docker`.
* The test suite can now be run with `make test`.
* A coverage report can be generated with `make test-coverage`. Open `coverage/index.html` in your web browser to inspect the results.
......@@ -65,7 +65,7 @@ issuing `systemctl start docker`.
Bats arguments or specific test can be run by providing `CASES` and `BATS_ARGS`:
```
make test DOCKER=podman CASES=cases/db-update.bats BATS_ARGS='-f Wrong'
make test CASES=cases/db-update.bats BATS_ARGS='-f Wrong'
```
## License
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment