version

Author: achamayou

CMakeLists.txt

@@ -1134,7 +1134,6 @@ if(BUILD_TESTS)
     CONFIGURATIONS snp
   )
 
-  list(APPEND LTS_TEST_ARGS --ccf-version ${CCF_VERSION})
   if(LONG_TESTS)
     list(APPEND LTS_TEST_ARGS --check-ledger-compatibility)
   endif()
@@ -1165,11 +1164,10 @@ if(BUILD_TESTS)
     set(ROTATION_TEST_ARGS --rotation-retirements 10)
   endif()
 
-  set(RECONFIG_TEST_ARGS --ccf-version ${CCF_VERSION})
   add_e2e_test(
     NAME nodes_test
     PYTHON_SCRIPT ${CMAKE_SOURCE_DIR}/tests/nodes.py
-    ADDITIONAL_ARGS ${RECONFIG_TEST_ARGS} ${ROTATION_TEST_ARGS}
+    ADDITIONAL_ARGS ${ROTATION_TEST_ARGS}
   )
 
   add_piccolo_test(

tests/infra/e2e_args.py

@@ -401,6 +401,15 @@ def cli_args(
         with open(pre_args.defaults_file, "r") as f:
             config = json.load(f)
         LOG.info(f"Loaded default args from {pre_args.defaults_file}")
+        # If ccf_version is not already in the config, try to read it from
+        # VERSION_LONG in the same directory as the defaults file.
+        if "ccf_version" not in config:
+            version_long_path = os.path.join(
+                os.path.dirname(pre_args.defaults_file), "VERSION_LONG"
+            )
+            if os.path.isfile(version_long_path):
+                with open(version_long_path, "r") as vf:
+                    config["ccf_version"] = vf.read().strip()
         parser.set_defaults(**config)
 
     if accept_unknown: