preserve cache for makefile

Author: grodzki-lanl

stackinator/builder.py

@@ -227,6 +227,7 @@ 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,

stackinator/recipe.py

@@ -174,6 +174,7 @@ def __init__(self, args):
         # mirrors specified on the command line.
         self._logger.debug("Configuring mirrors.")
         self._mirrors = mirror.Mirrors(self.system_config_path, args.cache)
+        self._cache = [mirror for mirror in self.mirrors if mirror["buildcache"]]
 
         # optional post install hook
         if self.post_install_hook is not None:
@@ -235,6 +236,10 @@ def pre_install_hook(self):
     @property
     def mirrors(self):
         return self._mirrors
+    
+    @property
+    def cache(self):
+        return self._cache
 
     @property
     def config(self):
@@ -515,7 +520,7 @@ def compiler_files(self):
         )
 
         makefile_template = env.get_template("Makefile.compilers")
-        push_to_cache = self.mirrors
+        push_to_cache = self.cache
         files["makefile"] = makefile_template.render(
             compilers=self.compilers,
             push_to_cache=push_to_cache,
@@ -546,7 +551,7 @@ def environment_files(self):
         jenv.filters["py2yaml"] = schema.py2yaml
 
         makefile_template = jenv.get_template("Makefile.environments")
-        push_to_cache = self.mirror is not None
+        push_to_cache = self.cache is not None
         files["makefile"] = makefile_template.render(
             environments=self.environments,
             push_to_cache=push_to_cache,

stackinator/schema.py

@@ -121,3 +121,4 @@ def check_module_paths(instance):
 EnvironmentsValidator = SchemaValidator(prefix / "schema/environments.json")
 CacheValidator = SchemaValidator(prefix / "schema/cache.json")
 ModulesValidator = SchemaValidator(prefix / "schema/modules.json", check_module_paths)
+MirrorsValidator = SchemaValidator(prefix / "schema/mirror.json")

stackinator/templates/Makefile

@@ -32,25 +32,20 @@ pre-install: spack-setup
 	$(SANDBOX) $(STORE)/pre-install-hook
 
 mirror-setup: spack-setup{% if pre_install_hook %} pre-install{% endif %}
+
 	{% if cache %}
-	# The old way of managing mirrors
 	$(SANDBOX) $(SPACK) buildcache keys --install --trust
-	{% if cache.key %}
-	$(SANDBOX) $(SPACK) gpg trust {{ cache.key }}
-	{% endif %}
 	{% endif %}
 	{% if mirrors %}
-	@echo "Adding mirrors and gpg keys."
-	{% for mirror_info in mirrors | reverse %}
-	$(SANDBOX) $(SPACK) mirror add --scope=site {{ mirror_info.name }} {{ mirror_info.url }}
-	$(SANDBOX) $(SPACK)	gpg trust {{ mirror_info.key_path }}
+	@echo "Adding mirror gpg keys."
+	{% for mirror in mirrors | reverse %}
+	{% if mirror.public_key %}
+	$(SANDBOX) $(SPACK)	gpg trust {{ mirror.public_key }}
+	{% endif %}
 	{% endfor %}
 	@echo "Current mirror list:"
 	$(SANDBOX) $(SPACK) mirror list
 	{% endif %}
-	{% for mirror_info in filter(lambda m: m['bootstrap'], mirrors) | filter() %}
-	$(SANDBOX) $(SPACK) bootstrap add --scope=site {{ mirror_info.name }} bootstrap/{{ mirror_info.name }}
-	{% endfor %}
 	touch mirror-setup
 
 compilers: mirror-setup
@@ -89,14 +84,14 @@ store.squashfs: post-install
 
 # Force push all built packages to the build cache
 cache-force: mirror-setup
-{% if cache.key %}
+{% if cache %}
 	$(warning ================================================================================)
 	$(warning Generate the config in order to force push partially built compiler environments)
 	$(warning if this step is performed with partially built compiler envs, you will)
 	$(warning likely have to start a fresh build (but that's okay, because build caches FTW))
 	$(warning ================================================================================)
 	$(SANDBOX) $(MAKE) -C generate-config
-	$(SANDBOX) $(SPACK) --color=never -C $(STORE)/config buildcache create --rebuild-index --only=package alpscache \
+	$(SANDBOX) $(SPACK) --color=never -C $(STORE)/config buildcache create --rebuild-index --only=package cache.name \
 	$$($(SANDBOX) $(SPACK_HELPER) -C $(STORE)/config find --format '{name};{/hash};version={version}' \
 	| grep -v -E '^({% for p in exclude_from_cache %}{{ pipejoiner() }}{{ p }}{% endfor %});'\
 	| grep -v -E 'version=git\.'\