Now add mount specific paths to certain mirrors.

Author: Paul-Ferrell

stackinator/builder.py

@@ -227,13 +227,13 @@ def generate(self, recipe):
         with (self.path / "Makefile").open("w") as f:
             f.write(
                 makefile_template.render(
-                    cache = recipe.cache,
                     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,
-                    mirrors=recipe.mirrors.mirrors,
+                    gpg_keys=recipe.mirrors.keys,
+                    cache=recipe.mirrors.buildcache,
                     exclude_from_cache=["nvhpc", "cuda", "perl"],
                     verbose=False,
                 )

stackinator/mirror.py

@@ -173,9 +173,12 @@ def _create_spack_mirrors_yaml(self, dest: pathlib.Path):
         raw = {"mirrors": {}}
 
         for name, mirror in self.mirrors.items():
-            name = mirror["name"]
             url = mirror["url"]
 
+            # Make the mirror path specific to the mount point
+            if mirror['mount_specific'] and self._mount_point is not None:
+                url = url.rstrip('/') + '/' + self._mount_point.as_posix().lstrip('/')
+
             raw["mirrors"][name] = {
                 "fetch": {"url": url},
                 "push": {"url": url},

stackinator/templates/Makefile

@@ -33,19 +33,14 @@ pre-install: spack-setup
 
 mirror-setup: spack-setup{% if pre_install_hook %} pre-install{% endif %}
 
-	{% if cache %}
+	@echo "Pulling and trusting keys from configured buildcaches."
 	$(SANDBOX) $(SPACK) buildcache keys --install --trust
-	{% endif %}
-	{% if mirrors %}
 	@echo "Adding mirror gpg keys."
-	{% for mirror in mirrors | reverse %}
-	{% if mirror.public_key %}
-	$(SANDBOX) $(SPACK)	gpg trust {{ mirror.public_key }}
-	{% endif %}
+	{% for key_path in gpg_keys %}
+	$(SANDBOX) $(SPACK)	gpg trust {{ key_path }}
 	{% endfor %}
 	@echo "Current mirror list:"
 	$(SANDBOX) $(SPACK) mirror list
-	{% endif %}
 	touch mirror-setup
 
 compilers: mirror-setup