Refactored Haskell tester configuration

Author: david-yz-liu

server/autotest_server/testers/haskell/config.py

@@ -0,0 +1,2 @@
+HASKELL_TEST_DEPS = ["tasty-discover", "tasty-quickcheck", "tasty-hunit"]
+STACK_RESOLVER = "lts-21.21"

server/autotest_server/testers/haskell/requirements.system

@@ -2,7 +2,7 @@
 set -euxo pipefail
 
 # Install a system-wide ghc, which can be used as a default version in the Haskell tester.
-# This should be synchronized with the LTS version and dependencies in setup.py
+# This should be synchronized with the LTS version and dependencies in config.py
 if ! dpkg -l ghc cabal-install &> /dev/null; then
   apt-get -y update
   DEBIAN_FRONTEND=noninteractive apt-get install -y -o 'Dpkg::Options::=--force-confdef' -o 'Dpkg::Options::=--force-confold' ghc cabal-install

server/autotest_server/testers/haskell/schema.py

@@ -4,6 +4,8 @@
 from msgspec import Meta, Struct
 from markus_autotesting_core.types import BaseTestData, BaseTesterSettings
 
+from .config import STACK_RESOLVER
+
 
 class HaskellTesterSettings(BaseTesterSettings):
     """The settings for the Haskell tester."""
@@ -22,4 +24,4 @@ class HaskellTestData(BaseTestData, kw_only=True):
 class HaskellEnvData(Struct, kw_only=True):
     """Settings for the Haskell environment"""
 
-    resolver_version: Annotated[str, Meta(title="Stackage LTS resolver version")] = "lts-21.21"
+    resolver_version: Annotated[str, Meta(title="Stackage LTS resolver version")] = STACK_RESOLVER

server/autotest_server/testers/haskell/setup.py

@@ -1,12 +1,10 @@
 import os
 import subprocess
 
+from .config import HASKELL_TEST_DEPS, STACK_RESOLVER
 from ..schema import generate_schema
 from .schema import HaskellTesterSettings
 
-HASKELL_TEST_DEPS = ["tasty-discover", "tasty-quickcheck", "tasty-hunit"]
-STACK_RESOLVER = "lts-21.21"
-
 
 def create_environment(_settings, _env_dir, default_env_dir):
     env_data = _settings.get("env_data", {})
@@ -53,6 +51,4 @@ def install():
 
 
 def settings():
-    json_schema, components = generate_schema(HaskellTesterSettings)
-    components["HaskellEnvData"]["properties"]["resolver_version"]["default"] = STACK_RESOLVER
-    return json_schema, components
+    return generate_schema(HaskellTesterSettings)