ci: Generalize running commands inside the container

Both for ci-build and ci-shell we want to execute basically
the same setup and cleanup logic, the only difference being
that for the former we then run the build script and with the
latter a shell.

Rework the targets so that they both call the generic
ci-run-command rule passing an appropriate $(CI_COMMAND).

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/ci/Makefile b/ci/Makefile
index e8b7b447c2d005d3180c1df0b78d3c6dc6c4e5c3..2170f5d3e41fb9f1161a99a692b4be7f77fd7cdf 100644 (file)
--- a/ci/Makefile
+++ b/ci/Makefile
@@ -210,7 +210,7 @@ ci-prepare-tree: ci-check-engine
                done ; \
        fi
 
-ci-build@%: ci-prepare-tree
+ci-run-command@%: ci-prepare-tree
        $(CI_ENGINE) run $(CI_ENGINE_ARGS) $(CI_IMAGE_PREFIX)$*$(CI_IMAGE_TAG) \
                /bin/bash -c ' \
                export CI_CONT_SRCDIR="$(CI_CONT_SRCDIR)"; \
@@ -219,16 +219,18 @@ ci-build@%: ci-prepare-tree
                export CI_CONFIGURE="$(CI_CONFIGURE)"; \
                export CI_CONFIGURE_ARGS="$(CI_CONFIGURE_ARGS)"; \
                export CI_MAKE_ARGS="$(CI_MAKE_ARGS)"; \
-               $(CI_USER_HOME)/build || exit 1'
+               $(CI_COMMAND) || exit 1'
        @test "$(CI_CLEAN)" = "1" && rm -rf $(CI_SCRATCHDIR) || :
 
+ci-shell@%:
+       $(MAKE) -C $(CI_ROOTDIR) ci-run-command@$* CI_COMMAND="/bin/bash"
+
+ci-build@%:
+       $(MAKE) -C $(CI_ROOTDIR) ci-run-command@$* CI_COMMAND="$(CI_USER_HOME)/build"
+
 ci-check@%:
        $(MAKE) -C $(CI_ROOTDIR) ci-build@$* CI_MAKE_ARGS="check"
 
-ci-shell@%: ci-prepare-tree
-       $(CI_ENGINE) run $(CI_ENGINE_ARGS) $(CI_IMAGE_PREFIX)$*$(CI_IMAGE_TAG) /bin/bash
-       @test "$(CI_CLEAN)" = "1" && rm -rf $(CI_SCRATCHDIR) || :
-
 ci-help:
        @echo "Build libvirt inside containers used for CI"
        @echo