Updated prerelease injection to git-based repos format, updated tests

Author: CodeGat

scripts/spack_manifest/injection/prerelease.py

@@ -65,15 +65,17 @@ def inject_prerelease_information(
         updated_manifest, root_spec_name, version
     )
 
+    if spack_packages_path:
+        # Add the 'repo:' section for prerelease spack packages if provided
+        updated_manifest = add_prerelease_repos_section(
+            updated_manifest, spack_packages_path
+        )
+
     # Dump the current dict, and add the non-standard 'repo::' section
     manifest_str: str = yaml.dump(
         updated_manifest, default_flow_style=False, sort_keys=False
     )
 
-    if spack_packages_path:
-        # Add the 'repo::' section for prerelease spack packages if provided
-        manifest_str = add_prerelease_repos_section(manifest_str, spack_packages_path)
-
     return manifest_str
 
 
@@ -138,14 +140,19 @@ def update_root_spec_projection_version(
     return manifest
 
 
-def add_prerelease_repos_section(manifest_str: str, spack_packages_path: str) -> str:
-    manifest_str += (
-        f"  repos::\n"
-        f"  - {spack_packages_path}\n"
-        f"  - $spack/var/spack/repos/builtin\n"
-    )
+def add_prerelease_repos_section(
+    manifest: dict[str, Any], spack_packages_path: str
+) -> dict[str, Any]:
 
-    return manifest_str
+    manifest.setdefault("spack", {}).setdefault("repos", {})
+    manifest["spack"]["repos"] = {
+        "access_spack_packages": {
+            "git": "https://github.com/ACCESS-NRI/access-spack-packages.git",
+            "destination": spack_packages_path,
+        }
+    }
+
+    return manifest
 
 
 def parse_args(args: list[str]) -> argparse.Namespace:

tests/scripts/spack_manifest/injection/outputs/expected.prerelease.spack.yaml

@@ -45,6 +45,7 @@ spack:
         projections:
           access-om2: '{name}/pr12-12'
           mom5: 'access-om2/dependencies/pr12-12/{name}/2023.11.09-{hash:7}'
-  repos::
-  - /some/spack-packages
-  - $spack/var/spack/repos/builtin
+  repos:
+    access_spack_packages:
+      git: https://github.com/ACCESS-NRI/access-spack-packages.git
+      destination: /some/spack-packages

tests/scripts/spack_manifest/injection/test_prerelease.py

@@ -123,20 +123,24 @@ def test_remove_potential_root_spec_git_version__invalid_no_git_version(self):
 
 class TestAddPrereleaseReposSection:
     def test_add_prerelease_repos_section__valid(self):
-        manifest_str = "spack:\n  specs:\n    - access-om2@git.1.0.0\n"
+        manifest = {
+            "spack": {
+                "specs": [
+                    "access-om2@1.0.0"
+                ]
+            }
+        }
         spack_packages_path = "/path/to/spack/packages"
 
-        updated_manifest_str = add_prerelease_repos_section(manifest_str, spack_packages_path)
-
-        last_three_lines = "\n".join(updated_manifest_str.splitlines()[-3:])
-
-        expected_last_three_lines = (
-            f"  repos::\n"
-            f"  - {spack_packages_path}\n"
-            f"  - $spack/var/spack/repos/builtin\n"
-        )
+        updated_manifest = add_prerelease_repos_section(manifest, spack_packages_path)
 
-        assert last_three_lines.strip() == expected_last_three_lines.strip()
+        expected_repos_section = {
+            "access_spack_packages": {
+                "git": "https://github.com/ACCESS-NRI/access-spack-packages.git",
+                "destination": spack_packages_path,
+            }
+        }
+        assert updated_manifest["spack"]["repos"] == expected_repos_section
 
 class TestInjectPrereleaseInformation:
     def test_inject_prerelease_information__valid(self):