Skip to content

Commit

Permalink
Merge pull request #376 from kmehant/makefile-patch
Browse files Browse the repository at this point in the history
build test image on every test run as part of test-in-container
  • Loading branch information
TomasTomecek committed Jan 7, 2020
2 parents 583f8ad + 68f9b8b commit 585d7fe
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ exec-test:
@# use it like this: `make exec-test TEST_TARGET="tests/unit/"`
PYTHONPATH=$(CURDIR) pytest $(TEST_TARGET) --verbose --showlocals

check: container-image build-test-container test-in-container docs-in-container
check: container-image test-in-container docs-in-container

build-docs-container:
docker build --network host --tag=$(DOCS_IMAGE_NAME) -f ./Dockerfile.docs .
Expand All @@ -47,9 +47,9 @@ container:
build-test-container:
docker build --network host --tag=$(TEST_IMAGE_NAME) -f ./Dockerfile.tests .

centos-ci-test: setup-oc-cluster-ci container-image build-test-container test-in-container
centos-ci-test: setup-oc-cluster-ci container-image test-in-container

test-in-container:
test-in-container: build-test-container
@# use it like this: `make test-in-container TEST_TARGET=tests/integration/test_utils.py`
$(eval kubedir := $(shell mktemp -d /tmp/tmp.conu-kube-XXXXX))
sed -e s@"${HOME}"@/root@g ${HOME}/.kube/config > $(kubedir)/config ; \
Expand Down

0 comments on commit 585d7fe

Please sign in to comment.