[libvirt] [PATCH 02/10] ci: Drop $(CI_SUBMODULES)

Andrea Bolognani abologna at redhat.com
Fri Aug 16 09:49:46 UTC 2019


We only use the list of submodules once, so no need to
store it in a variable.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 Makefile.ci | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Makefile.ci b/Makefile.ci
index 14d595a00f..86e936aef8 100644
--- a/Makefile.ci
+++ b/Makefile.ci
@@ -42,10 +42,6 @@ CI_MAKE_ARGS =
 # Any extra arguments to pass to configure
 CI_CONFIGURE_ARGS =
 
-# Avoid pulling submodules over the network by locally
-# cloning them
-CI_SUBMODULES = $(shell git submodule | awk '{ print $$2 }')
-
 # Location of the container images we're going to pull
 # Can be useful to overridde to use a locally built
 # image instead
@@ -182,7 +178,7 @@ ci-prepare-tree: ci-check-engine
 		cp /etc/group $(CI_SCRATCHDIR); \
 		echo "Cloning $(CI_GIT_ROOT) to $(CI_HOST_SRCDIR)"; \
 		git clone $(CI_GIT_ARGS) $(CI_GIT_ROOT) $(CI_HOST_SRCDIR) || exit 1; \
-		for mod in $(CI_SUBMODULES) ; \
+		for mod in $$(git submodule | awk '{ print $$2 }') ; \
 		do \
 			test -f $(CI_GIT_ROOT)/$$mod/.git || continue ; \
 			echo "Cloning $(CI_GIT_ROOT)/$$mod to $(CI_HOST_SRCDIR)/$$mod"; \
-- 
2.21.0




More information about the libvir-list mailing list