For "when:" and install_environment.json: Support fully qualified hostname (#45522)

Jordan474 · web-flow · commit 6b0011c8f129 · 2024-08-28T18:38:54.000+02:00
diff --git a/lib/spack/docs/environments.rst b/lib/spack/docs/environments.rst
@@ -893,8 +893,9 @@ The valid variables for a ``when`` clause are:
 
 #. ``env``. The user environment (usually ``os.environ`` in Python).
 
-#. ``hostname``. The hostname of the system (if ``hostname`` is an
-   executable in the user's PATH).
+#. ``hostname``. The hostname of the system.
+
+#. ``full_hostname``. The fully qualified hostname of the system.
 
 ^^^^^^^^^^^^^^^^^^^^^^^^
 SpecLists as Constraints
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py
@@ -4892,6 +4892,7 @@ def get_host_environment() -> Dict[str, Any]:
         "architecture": arch_spec,
         "arch_str": str(arch_spec),
         "hostname": socket.gethostname(),
+        "full_hostname": socket.getfqdn(),
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -4892,6 +4892,7 @@ def get_host_environment() -> Dict[str, Any]:`
`4892`	`4892`	`"architecture": arch_spec,`
`4893`	`4893`	`"arch_str": str(arch_spec),`
`4894`	`4894`	`"hostname": socket.gethostname(),`
	`4895`	`+ "full_hostname": socket.getfqdn(),`
`4895`	`4896`	`}`
`4896`	`4897`
`4897`	`4898`