vbatts/containers-bsi
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Makefile: export env vars and add BATS_OPTS

Browse source 
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg 2019-09-19 13:50:30 +02:00
parent 5f249c84e8
commit 03cdb6f9a5
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -1,6 +1,7 @@
SRC := ./BuildSourceImage.sh SRC := ./BuildSourceImage.sh
CTR_IMAGE := localhost/containers/buildsourceimage CTR_IMAGE := localhost/containers/buildsourceimage
CTR_ENGINE ?= podman CTR_ENGINE ?= podman
BATS_OPTS ?=
cleanfiles = cleanfiles =
# these are packages whose src.rpms are very small # these are packages whose src.rpms are very small
srpm_urls = \ srpm_urls = \
@ -9,6 +10,9 @@ srpm_urls = \
https://archive.kernel.org/centos-vault/7.0.1406/os/Source/SPackages/centos-bookmarks-7-1.el7.src.rpm https://archive.kernel.org/centos-vault/7.0.1406/os/Source/SPackages/centos-bookmarks-7-1.el7.src.rpm
srpms = $(addprefix ./.testprep/srpms/,$(notdir $(rpms))) srpms = $(addprefix ./.testprep/srpms/,$(notdir $(rpms)))
export CTR_IMAGE
export CTR_ENGINE
all: validate all: validate
validate: .validate validate: .validate
@ -35,7 +39,7 @@ cleanfiles += .testprep $(srpms)
test-integration: .build-container .testprep test-integration: .build-container .testprep
@echo @echo
@echo "==> Running integration tests" @echo "==> Running integration tests"
CTR_IMAGE=$(CTR_IMAGE) CTR_ENGINE=$(CTR_ENGINE) TMPDIR=$(shell realpath .testprep/tmp) bats test/ TMPDIR=$(shell realpath .testprep/tmp) bats $(BATS_OPTS) test/
clean: clean: