allow global.conf jinja include

conans/client/cache/cache.py

@@ -3,8 +3,7 @@
 from typing import List
 
 import yaml
-from jinja2 import Template
-
+from jinja2 import FileSystemLoader, Environment
 
 from conan.internal.cache.cache import DataCache, RecipeLayout, PackageLayout
 from conans.client.cache.editable import EditablePackages
@@ -152,7 +151,9 @@ def new_config(self):
                 distro = None
                 if platform.system() in ["Linux", "FreeBSD"]:
                     import distro
-                content = Template(text).render({"platform": platform, "os": os, "distro": distro})
+                base_path = os.path.dirname(self.new_config_path)
+                template = Environment(loader=FileSystemLoader(base_path)).from_string(text)
+                content = template.render({"platform": platform, "os": os, "distro": distro})
                 self._new_config.loads(content)
         return self._new_config
 

conans/test/integration/configuration/conf/test_conf.py

@@ -188,6 +188,23 @@ def test_jinja_global_conf(client):
         assert "user.mycompany:dist=42" in client.out
 
 
+def test_jinja_global_conf_include(client):
+    global_conf = textwrap.dedent("""\
+        {% include "user_global.conf" %}
+        {% import "user_global.conf" as vars %}
+        user.mycompany:dist = {{vars.myvar*2}}
+        """)
+    user_global_conf = textwrap.dedent("""\
+        {% set myvar = 42 %}
+        user.mycompany:parallel = {{myvar}}
+        """)
+    save(client.cache.new_config_path, global_conf)
+    save(os.path.join(client.cache_folder, "user_global.conf"), user_global_conf)
+    client.run("install .")
+    assert "user.mycompany:parallel=42" in client.out
+    assert "user.mycompany:dist=84" in client.out
+
+
 def test_empty_conf_valid():
     tc = TestClient()
     profile = textwrap.dedent(r"""

conans/test/integration/configuration/test_profile_jinja.py

@@ -36,7 +36,7 @@ def test_profile_template_variables():
     assert "os=FreeBSD" in client.out
 
 
-def test_profile_template_inclusion():
+def test_profile_template_import():
     client = TestClient()
     tpl1 = textwrap.dedent("""
         {% import "profile_vars" as vars %}
@@ -53,6 +53,23 @@ def test_profile_template_inclusion():
     assert "os=FreeBSD" in client.out
 
 
+def test_profile_template_include():
+    client = TestClient()
+    tpl1 = textwrap.dedent("""
+        {% include "profile_vars" %}
+        """)
+    tpl2 = textwrap.dedent("""
+        {% set a = "FreeBSD" %}
+        [settings]
+        os = {{ a }}
+        """)
+    client.save({"conanfile.py": GenConanfile(),
+                 "profile1": tpl1,
+                 "profile_vars": tpl2})
+    client.run("install . -pr=profile1")
+    assert "os=FreeBSD" in client.out
+
+
 def test_profile_template_profile_dir():
     client = TestClient()
     tpl1 = textwrap.dedent("""