Lanl/mirrors

requirements.txt

@@ -0,0 +1,12 @@
+attrs==25.4.0
+iniconfig==2.3.0
+jsonschema==4.26.0
+jsonschema-specifications==2025.9.1
+packaging==26.0
+pluggy==1.6.0
+pygments==2.19.2
+pytest==9.0.2
+python-magic==0.4.27
+pyyaml==6.0.3
+referencing==0.37.0
+rpds-py==0.30.0

stackinator/builder.py

@@ -11,7 +11,7 @@
 import jinja2
 import yaml
 
-from . import VERSION, cache, root_logger, spack_util
+from . import VERSION, root_logger, spack_util, mirror
 
 
 def install(src, dst, *, ignore=None, symlinks=False):
@@ -164,6 +164,7 @@ def environment_meta(self, recipe):
         self._environment_meta = meta
 
     def generate(self, recipe):
+        """Setup the recipe build environment."""
         # make the paths, in case bwrap is not used, directly write to recipe.mount
         store_path = self.path / "store" if not recipe.no_bwrap else pathlib.Path(recipe.mount)
         tmp_path = self.path / "tmp"
@@ -226,12 +227,13 @@ def generate(self, recipe):
         with (self.path / "Makefile").open("w") as f:
             f.write(
                 makefile_template.render(
-                    cache=recipe.mirror,
                     modules=recipe.with_modules,
                     post_install_hook=recipe.post_install_hook,
                     pre_install_hook=recipe.pre_install_hook,
                     spack_version=spack_version,
                     spack_meta=spack_meta,
+                    gpg_keys=recipe.mirrors.keys,
+                    cache=recipe.mirrors.buildcache,
                     exclude_from_cache=["nvhpc", "cuda", "perl"],
                     verbose=False,
                 )
@@ -312,11 +314,12 @@ def generate(self, recipe):
             fid.write(global_packages_yaml)
 
         # generate a mirrors.yaml file if build caches have been configured
-        if recipe.mirror:
-            dst = config_path / "mirrors.yaml"
-            self._logger.debug(f"generate the build cache mirror: {dst}")
-            with dst.open("w") as fid:
-                fid.write(cache.generate_mirrors_yaml(recipe.mirror))
+        self._logger.debug(f"Generating the spack mirror configs in '{config_path}'")
+        try:
+            recipe.mirrors.setup_configs(config_path)
+        except mirror.MirrorError as err:
+            self._logger.error(f"Could not set up mirrors.\n{err}")
+            return 1
 
         # Add custom spack package recipes, configured via Spack repos.
         # Step 1: copy Spack repos to store_path where they will be used to

stackinator/main.py

@@ -81,13 +81,31 @@ def log_header(args):
 def make_argparser():
     parser = argparse.ArgumentParser(description=("Generate a build configuration for a spack stack from a recipe."))
     parser.add_argument("--version", action="version", version=f"stackinator version {VERSION}")
-    parser.add_argument("-b", "--build", required=True, type=str)
+    parser.add_argument(
+        "-b",
+        "--build",
+        required=True,
+        type=str,
+        help="Where to set up the stackinator build directory. ('/tmp' is not allowed, use '/var/tmp'",
+    )
     parser.add_argument("--no-bwrap", action="store_true", required=False)
-    parser.add_argument("-r", "--recipe", required=True, type=str)
-    parser.add_argument("-s", "--system", required=True, type=str)
+    parser.add_argument(
+        "-r", "--recipe", required=True, type=str, help="Name of (and/or path to) the Stackinator recipe."
+    )
+    parser.add_argument(
+        "-s", "--system", required=True, type=str, help="Name of (and/or path to) the Stackinator system configuration."
+    )
     parser.add_argument("-d", "--debug", action="store_true")
-    parser.add_argument("-m", "--mount", required=False, type=str)
-    parser.add_argument("-c", "--cache", required=False, type=str)
+    parser.add_argument(
+        "-m", "--mount", required=False, type=str, help="The mount point where the environment will be located."
+    )
+    parser.add_argument(
+        "-c",
+        "--cache",
+        required=False,
+        type=str,
+        help="Buildcache location or name (from system config's mirrors.yaml).",
+    )
     parser.add_argument("--develop", action="store_true", required=False)
 
     return parser