WIP

Author: maxtropets

.github/workflows/ci.yml

@@ -116,7 +116,7 @@ jobs:
           # Dependencies
           tdnf -y install openssl-devel libuv-devel
           # Test dependencies
-          tdnf -y install libarrow-devel parquet-libs-devel lldb
+          tdnf -y install libarrow-devel parquet-libs-devel lldb npm jq expect
         shell: bash
 
       - uses: actions/checkout@v4
@@ -129,7 +129,7 @@ jobs:
           git config --global --add safe.directory /__w/CCF/CCF
           mkdir build
           cd build
-          CC=`which clang` CXX=`which clang++` cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DLVI_MITIGATIONS=OFF -DUSE_LIBCXX=OFF ..
+          CC=`which clang` CXX=`which clang++` cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DLVI_MITIGATIONS=OFF -DUSE_LIBCXX=OFF -DCDDL_CHECK=OFF ..
           ninja
         shell: bash
 
@@ -142,4 +142,6 @@ jobs:
           export ASAN_SYMBOLIZER_PATH=$(realpath /usr/bin/llvm-symbolizer-15)
           # Unit tests
           ./tests.sh --output-on-failure -L unit -j$(nproc --all)
+          # All other acceptably fast tests, which are now supported on Mariner.
+          ./tests.sh --timeout 360 --output-on-failure -LE "benchmark|protocolstest|suite|unit"|lts_compatibility|raft_scenario"
         shell: bash

CMakeLists.txt

@@ -100,6 +100,9 @@ option(SAN "Enable Address and Undefined Behavior Sanitizers" OFF)
 option(BUILD_END_TO_END_TESTS "Build end to end tests" ON)
 option(COVERAGE "Enable coverage mapping" OFF)
 option(SHUFFLE_SUITE "Shuffle end to end test suite" OFF)
+option(CDDL_CHECK
+       "Run cddl schema check agains certain CBOR envelopes in e2e tests" ON
+)
 option(LONG_TESTS "Enable long end-to-end tests" OFF)
 option(KV_STATE_RB "Enable RBMap as underlying KV state implementation" OFF)
 if(KV_STATE_RB)
@@ -1297,6 +1300,7 @@ if(BUILD_TESTS)
         TEST lts_compatibility
         APPEND
         PROPERTY ENVIRONMENT "LTS_COMPAT_GOV_CLIENT=1"
+        PROPERTY LABELS lts_compatibility
       )
     endif()
 

cmake/common.cmake

@@ -128,6 +128,14 @@ function(add_e2e_test)
       )
     endif()
 
+    if(CDDL_CHECK)
+      set_property(
+        TEST ${PARSED_ARGS_NAME}
+        APPEND
+        PROPERTY ENVIRONMENT "CDDL_CHECK=1"
+      )
+    endif()
+
     if("${PARSED_ARGS_LABEL}" STREQUAL "partitions")
       set_property(
         TEST ${PARSED_ARGS_NAME}

tests/e2e_logging.py

@@ -2274,7 +2274,7 @@ def run_main_tests(network, args):
     test_remove(network, args)
     test_clear(network, args)
     test_record_count(network, args)
-    if args.package == "samples/apps/logging/liblogging":
+    if args.package == "samples/apps/logging/liblogging" and os.getenv("CDDL_CHECK"):
         test_cbor_merkle_proof(network, args)
         test_cose_signature_schema(network, args)
         test_cose_receipt_schema(network, args)

tests/recovery.py

@@ -89,18 +89,19 @@ def verify_endorsements_chain(primary, endorsements, pubkey):
             time.time() - cose_msg.phdr[CWT_KEY][IAT_CWT_LABEL] < last_five_minutes
         ), cose_msg.phdr
 
-        endorsement_filename = "prev_service_identoty_endorsement.cose"
-        with open(endorsement_filename, "wb") as f:
-            f.write(endorsement)
-        subprocess.run(
-            [
-                "cddl",
-                "../cddl/ccf-cose-endorsement-service-identity.cddl",
-                "v",
-                endorsement_filename,
-            ],
-            check=True,
-        )
+        if os.getenv("CDDL_CHECK"):
+            endorsement_filename = "prev_service_identoty_endorsement.cose"
+            with open(endorsement_filename, "wb") as f:
+                f.write(endorsement)
+            subprocess.run(
+                [
+                    "cddl",
+                    "../cddl/ccf-cose-endorsement-service-identity.cddl",
+                    "v",
+                    endorsement_filename,
+                ],
+                check=True,
+            )
 
         next_key_bytes = cose_msg.payload
         pubkey = serialization.load_der_public_key(next_key_bytes, default_backend())