renaming spack_package to spack_packaged

ACCESS-NRI · Jul 5, 2024 · 118591f · 118591f
1 parent c799207
commit 118591f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/scripts/generate-build-metadata.bash b/scripts/generate-build-metadata.bash
@@ -45,7 +45,7 @@ model=$(jq \
       spec: (.value.name + "@" + .value.version),
       created_at: $release_time,
       release_url: $release_url,
-      spack_package: $spack_packages_version,
+      spack_packages: $spack_packages_version,
       spack_config: $spack_config_version,
       spack_version: $spack
   }' "$json_dir/spack.lock"

diff --git a/tests/scripts/generate-build-metadata/valid/build_metadata.json b/tests/scripts/generate-build-metadata/valid/build_metadata.json
@@ -4,7 +4,7 @@
     "spec": "[email protected]=2024.03.0",
     "created_at": "2024-03-27T05:29:36Z",
     "release_url": "http://example.org/releases",
-    "spack_package": "2023.11.23",
+    "spack_packages": "2023.11.23",
     "spack_config": "2024.01.01",
     "spack_version": {
       "version": "0.20.3",

diff --git a/tools/release_provenance/models.py b/tools/release_provenance/models.py
@@ -33,7 +33,7 @@ class ModelBuild(Base):
     spack_hash = Column(String, primary_key=True, index=True)
     spec = Column(String, nullable=False)
     spack_version = Column(String, ForeignKey("spack_version.commit"))
-    spack_package = Column(String)
+    spack_packages = Column(String)
     spack_config = Column(String)
     created_at = Column(DateTime, nullable=False)
     release_url = Column(Text, nullable=False, unique=True)

diff --git a/tools/release_provenance/save_release.py b/tools/release_provenance/save_release.py
@@ -34,7 +34,7 @@ def get_model_build(model_build_data):
         model_build = ModelBuild()
         model_build.spack_version = get_spack_version(model_build_data["spack_version"])
         model_build.spack_config = model_build_data["spack_config"]
-        model_build.spack_package = model_build_data["spack_package"]
+        model_build.spack_packages = model_build_data["spack_packages"]
         model_build.spack_hash = model_build_data["spack_hash"]
         model_build.spec = model_build_data["spec"]
         model_build.release_url = model_build_data["release_url"]

diff --git a/tools/release_provenance/test_release_data.json b/tools/release_provenance/test_release_data.json
@@ -16,7 +16,7 @@
       "spec": "[email protected]=2023.11.23",
       "created_at": "2024/02/13 11:49:00",
       "release_url": "https://github.com/ACCESS-NRI/ACCESS-OM3/releases",
-      "spack_package": "0.20.3",
+      "spack_packages": "0.20.3",
       "spack_config": "0.20.3",
       "spack_version": {
         "commit": "6812713cf470b473a607f0de0e8e1cf53f804fb8",