[libvirt-jenkins-ci PATCH 3/3] lcitool: Include some paths in the generated Dockerfiles
These paths are a reflections of the contents of the container
image, so it makes sense to expose them in the container's
environment.
This will allow the GitLab CI integration for both libvirt and
libosinfo to stop setting these values themselves and start
relying on them being already present in the environment instead.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
guests/lcitool | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/guests/lcitool b/guests/lcitool
index b72abec..9559002 100755
--- a/guests/lcitool
+++ b/guests/lcitool
@@ -651,6 +651,9 @@ class Application:
varmap = self._dockerfile_build_varmap_rpm(facts, mappings, pip_mappings,
projects, cross_arch)
varmap["package_manager"] = facts["package_manager"]
+ varmap["make"] = facts["make"]
+ varmap["ninja"] = facts["ninja"]
+ varmap["python"] = facts["python"]
if cross_arch:
varmap["cross_abi"] = Util.native_arch_to_abi(cross_arch)
@@ -895,6 +898,10 @@ class Application:
sys.stdout.write(textwrap.dedent("""
ENV LANG "en_US.UTF-8"
+
+ ENV MAKE "{make}"
+ ENV NINJA "{ninja}"
+ ENV PYTHON "{python}"
""").format(**varmap))
if cross_arch:
--
2.25.1