Skip to content

Commit

Permalink
build_aux: don't recreate testing image every time new test is launched
Browse files Browse the repository at this point in the history
  • Loading branch information
nikromen committed May 25, 2023
1 parent b584cae commit efa6f29
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
5 changes: 4 additions & 1 deletion build_aux/Containerfile.unittest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM fedora:37

RUN dnf update -y && dnf install dnf-plugins-core -y && dnf install python-pytest-cov rpmdevtools python3-copr copr-cli -y
RUN dnf update -y && dnf install python-pytest-cov copr-dist-git rpmdevtools python3-copr copr-cli dnf-plugins-core -y

RUN useradd copr_user
USER copr_user
Expand All @@ -10,3 +10,6 @@ COPY --chown=copr_user . /home/copr_user/copr
USER root
RUN dnf builddep *.spec -y
USER copr_user

# bind the code from local machine here
WORKDIR /home/copr_user/copr_bind
14 changes: 11 additions & 3 deletions build_aux/per-subdir-makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
COPR_TEST_IMAGE ?= copr_test_image
CONTAINER_ENGINE ?= $(shell command -v podman 2> /dev/null || echo docker)

.PHONY: check test lint unittests

# we keep this serialized to avoid messed standard output
Expand All @@ -13,7 +16,12 @@ unittests:
lint:
vcs-diff-lint

build-test-image:
$(CONTAINER_ENGINE) build -f ../build_aux/Containerfile.unittest . -t $(COPR_TEST_IMAGE)

enter-test-image:
$(CONTAINER_ENGINE) run -v .:/home/copr_user/copr_bind:Z -ti $(COPR_TEST_IMAGE) /bin/bash

unittest-in-container:
podman build -f ../build_aux/Containerfile.unittest . -t copr_test_image
podman run --rm -it copr_test_image /bin/sh -c "./run_tests.sh -vv -s"
podman image rm copr_test_image
$(CONTAINER_ENGINE) run --rm -v .:/home/copr_user/copr_bind:Z \
-it $(COPR_TEST_IMAGE) /bin/sh -c "./run_tests.sh -vvv -s --no-coverage"

0 comments on commit efa6f29

Please sign in to comment.