Update tracking_services_data.py schema and generation to 2-0-0, reorganise tests

Author: CodeGat

scripts/release_provenance/tracking_services_data.py

@@ -8,7 +8,7 @@
 from pathlib import Path
 from typing import Any
 
-TRACKING_SERVICES_JSON_SCHEMA_VERSION = "1-0-0"
+TRACKING_SERVICES_JSON_SCHEMA_VERSION = "2-0-0"
 TRACKING_SERVICES_JSON_SCHEMA_URL = f"https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/tracking_services/release_provenance/telemetry/{TRACKING_SERVICES_JSON_SCHEMA_VERSION}.json"
 
 
@@ -121,8 +121,10 @@ def _format_telemetry_of_deployment_target(
             "deployment_target.spack_git_hash": outputs["spack_git_hash"],
             "deployment_target.spack_config_version": outputs["spack_config_version"],
             "deployment_target.spack_config_git_hash": outputs["spack_config_git_hash"],
-            "deployment_target.spack_packages_version": outputs["spack_packages_version"],
-            "deployment_target.spack_packages_git_hash": outputs["spack_packages_git_hash"],
+            "deployment_target.builtin_spack_packages_version": outputs["builtin_spack_packages_version"],
+            "deployment_target.builtin_spack_packages_git_hash": outputs["builtin_spack_packages_git_hash"],
+            "deployment_target.access_spack_packages_version": outputs["access_spack_packages_version"],
+            "deployment_target.access_spack_packages_git_hash": outputs["access_spack_packages_git_hash"],
             "deployment_target.module_use_location": outputs["deployment_modules_location"],
 
             "spack_model.name": root_spec,

…puts.Gadi/deploy-access-om3-outputs.Gadi …puts.Gadi/deploy-access-om3-outputs.Gaditests/scripts/release_provenance/inputs/1-0-0/deploy-access-om3-outputs.Gadi/deploy-access-om3-outputs.Gadi renamed to tests/scripts/release_provenance/inputs/deploy-access-om3-outputs.Gadi/deploy-access-om3-outputs.Gadi tests/scripts/release_provenance/inputs/1-0-0/deploy-access-om3-outputs.Gadi/deploy-access-om3-outputs.Gadi renamed to tests/scripts/release_provenance/inputs/deploy-access-om3-outputs.Gadi/deploy-access-om3-outputs.Gadi

@@ -5,8 +5,10 @@
   "spack_git_hash": "qwerty",
   "spack_config_version": "2025.02.2",
   "spack_config_git_hash": "asdfg",
-  "spack_packages_version": "2025.03.002",
-  "spack_packages_git_hash": "zxcvb",
+  "builtin_spack_packages_version": "2025.03.002",
+  "builtin_spack_packages_git_hash": "zxcvb",
+  "access_spack_packages_version": "2025.10.000",
+  "access_spack_packages_git_hash": "asdfg",
   "ci_configuration_check_failure": false,
   "release_deployment_version": "2025.01.2",
   "spack_environment_name": "access-esm1p6-dev_2025_03_4",

…st-metadata.Gadi/Gadi.build-db-pkgs.json …st-metadata.Gadi/Gadi.build-db-pkgs.jsontests/scripts/release_provenance/inputs/1-0-0/deploy-access-test-metadata.Gadi/Gadi.build-db-pkgs.json renamed to tests/scripts/release_provenance/inputs/deploy-access-test-metadata.Gadi/Gadi.build-db-pkgs.json tests/scripts/release_provenance/inputs/1-0-0/deploy-access-test-metadata.Gadi/Gadi.build-db-pkgs.json renamed to tests/scripts/release_provenance/inputs/deploy-access-test-metadata.Gadi/Gadi.build-db-pkgs.json

@@ -118,7 +118,7 @@ def test__format_tracking_services_header__valid(self):
 class TestFormatTelemetryOfModel():
 
     @patch("scripts.release_provenance.tracking_services_data._get_release_data_of_model_or_raise")
-    def test__format_telemetry_of_model_1_0_0__valid(self, release_data_mock):
+    def test__format_telemetry_of_model__valid(self, release_data_mock):
         expected_telemetry = {
             "model.name": "ACCESS-OM3",
             "model.deployment_repository_url": "https://github.com/ACCESS-NRI/ACCESS-OM3",
@@ -135,48 +135,50 @@ def test__format_telemetry_of_model_1_0_0__valid(self, release_data_mock):
             "html_url": "https://github.com/ACCESS-NRI/ACCESS-OM3/releases/tag/2025.01.2",
         }
 
-        actual_telemetry = _format_telemetry_of_model("ACCESS-NRI/ACCESS-OM3", Path("tests/scripts/release_provenance/inputs/1-0-0/deploy-access-om3-outputs.Gadi"))
+        actual_telemetry = _format_telemetry_of_model("ACCESS-NRI/ACCESS-OM3", Path("tests/scripts/release_provenance/inputs/deploy-access-om3-outputs.Gadi"))
 
         assert actual_telemetry == expected_telemetry, f"Expected {expected_telemetry}, but got {actual_telemetry}"
 
     @patch("scripts.release_provenance.tracking_services_data.requests.get", autospec=True)
-    def test__format_telemetry_of_model_1_0_0__invalid_repo(self, requests_mock):
+    def test__format_telemetry_of_model__invalid_repo(self, requests_mock):
 
         # Mock the response of the requests.get call to simulate an invalid repository
         requests_mock.return_value = Mock(status_code=404)
 
         with pytest.raises(ValueError):
-            _format_telemetry_of_model("invalid-repo", Path("tests/scripts/release_provenance/inputs/1-0-0/deploy-access-om3-outputs.Gadi"))
+            _format_telemetry_of_model("invalid-repo", Path("tests/scripts/release_provenance/inputs/deploy-access-om3-outputs.Gadi"))
 
-    def test__format_telemetry_of_model_1_0_0__invalid_file(self):
+    def test__format_telemetry_of_model_invalid_file(self):
         with pytest.raises(FileNotFoundError):
             _format_telemetry_of_model("ACCESS-NRI/ACCESS-OM3", Path("invalid-file-path"))
 
 class TestFormatTelemetryOfDeploymentTarget():
-    def test__format_telemetry_of_deployment_target_1_0_0__valid_with_no_components(self):
+    def test__format_telemetry_of_deployment_target___valid_with_no_components(self):
         # Removing the components from the expected telemetry as that is tested in TestFormatTelemetryOfModelComponents
         expected_telemetry_without_components = {
             "deployment_target.name": "Gadi",
             "deployment_target.spack_version": "0.22",
             "deployment_target.spack_git_hash": "qwerty",
             "deployment_target.spack_config_version": "2025.02.2",
             "deployment_target.spack_config_git_hash": "asdfg",
-            "deployment_target.spack_packages_version": "2025.03.002",
-            "deployment_target.spack_packages_git_hash": "zxcvb",
+            "deployment_target.builtin_spack_packages_version": "2025.03.002",
+            "deployment_target.builtin_spack_packages_git_hash": "zxcvb",
+            "deployment_target.access_spack_packages_version": "2025.10.000",
+            "deployment_target.access_spack_packages_git_hash": "asdfg",
             "deployment_target.module_use_location": "/g/data/vk83/modules",
 
             "spack_model.name": "access-om3",
             "spack_model.spack_package_hash": "3jdoekn73de234jdh38dzojhdjfriksndpqj84903",
             "spack_model.module_load_command": "access-om3/2025.01.2",
         }
 
-        actual_telemetry = _format_telemetry_of_deployment_target("access-om3", "Gadi", Path("tests/scripts/release_provenance/inputs/1-0-0/deploy-access-om3-outputs.Gadi"), Path("tests/scripts/release_provenance/inputs/1-0-0/deploy-access-test-metadata.Gadi"))
+        actual_telemetry = _format_telemetry_of_deployment_target("access-om3", "Gadi", Path("tests/scripts/release_provenance/inputs/deploy-access-om3-outputs.Gadi"), Path("tests/scripts/release_provenance/inputs/deploy-access-test-metadata.Gadi"))
         actual_telemetry_without_components = {k: v for k, v in actual_telemetry.items() if k not in ["spack_model_components"]}
 
         assert actual_telemetry_without_components == expected_telemetry_without_components, f"Without components, expected {expected_telemetry_without_components}, but got {actual_telemetry_without_components}"
 
 class TestFormatTelemetryOfModelComponents():
-    def test__format_telemetry_of_model_components_1_0_0__valid(self):
+    def test__format_telemetry_of_model_components__valid(self):
         expected_telemetry = [
             {
                 "name": "access-test-component",
@@ -187,7 +189,7 @@ def test__format_telemetry_of_model_components_1_0_0__valid(self):
             },
         ]
 
-        actual_telemetry = _format_telemetry_of_model_components("Gadi", Path("tests/scripts/release_provenance/inputs/1-0-0/deploy-access-test-metadata.Gadi"))
+        actual_telemetry = _format_telemetry_of_model_components("Gadi", Path("tests/scripts/release_provenance/inputs/deploy-access-test-metadata.Gadi"))
 
         assert actual_telemetry == expected_telemetry, f"Expected {expected_telemetry}, but got {actual_telemetry}"