From b1434491773f584726078df55dc68b3df46c52dc Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Mon, 23 Jun 2025 17:42:28 +0200 Subject: [PATCH 1/3] repo -> spack_repo/alps --- stackinator/builder.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stackinator/builder.py b/stackinator/builder.py index 66d50a5d..dfde2e50 100644 --- a/stackinator/builder.py +++ b/stackinator/builder.py @@ -414,7 +414,7 @@ def generate(self, recipe): # Delete the store/repo path, if it already exists. # Do this so that incremental builds (though not officially supported) won't break if a repo is updated. - repo_dst = store_path / "repo" + repo_dst = store_path / pathlib.Path("spack_repo", "alps") self._logger.debug(f"creating the stack spack prepo in {repo_dst}") if repo_dst.exists(): self._logger.debug(f"{repo_dst} exists ... deleting") @@ -432,13 +432,14 @@ def generate(self, recipe): """\ repo: namespace: alps + api: v2.0 """ ) # create the repository step 2: create the repos.yaml file in build_path/config repos_yaml_template = jinja_env.get_template("repos.yaml") with (config_path / "repos.yaml").open("w") as f: - repo_path = recipe.mount / "repo" + repo_path = recipe.mount / pathlib.Path("spack_repo", "alps") f.write(repos_yaml_template.render(repo_path=repo_path.as_posix(), verbose=False)) f.write("\n") From 13bdb1df3040d7bca2952aedbef07d95bd02c78a Mon Sep 17 00:00:00 2001 From: Simon Pintarelli <1237199+simonpintarelli@users.noreply.github.com> Date: Tue, 24 Jun 2025 08:41:06 +0200 Subject: [PATCH 2/3] Update stackinator/builder.py Co-authored-by: Mikael Simberg --- stackinator/builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stackinator/builder.py b/stackinator/builder.py index dfde2e50..aa950ba0 100644 --- a/stackinator/builder.py +++ b/stackinator/builder.py @@ -414,7 +414,7 @@ def generate(self, recipe): # Delete the store/repo path, if it already exists. # Do this so that incremental builds (though not officially supported) won't break if a repo is updated. - repo_dst = store_path / pathlib.Path("spack_repo", "alps") + repo_dst = store_path / "spack_repo" / "alps" self._logger.debug(f"creating the stack spack prepo in {repo_dst}") if repo_dst.exists(): self._logger.debug(f"{repo_dst} exists ... deleting") From 7f1c67fa54a34959f4af7879c1d342cfa4f03bc9 Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Tue, 24 Jun 2025 09:19:12 +0200 Subject: [PATCH 3/3] add missing /repos --- stackinator/builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stackinator/builder.py b/stackinator/builder.py index cf7989fa..64b8b873 100644 --- a/stackinator/builder.py +++ b/stackinator/builder.py @@ -411,7 +411,7 @@ def generate(self, recipe): # create the repository step 2: create the repos.yaml file in build_path/config repos_yaml_template = jinja_env.get_template("repos.yaml") with (config_path / "repos.yaml").open("w") as f: - repo_path = recipe.mount / "spack_repo" / "alps" + repo_path = recipe.mount / "repos" / "spack_repo" / "alps" builtin_repo_path = recipe.mount / "repos" / "spack_repo" / "builtin" f.write( repos_yaml_template.render(