From ebc6176a32177a944035e925f8f44018aca744ad Mon Sep 17 00:00:00 2001 From: Martin Kourim Date: Fri, 17 Apr 2026 18:01:39 +0200 Subject: [PATCH] fix(upgrade-tests): fix upgrade tests for 10.7.0 - Add log ignore rule for "tablesCodecVersion" error in stdout logs when upgrading to node versions < 10.8.0 to prevent false test failures. - Update ledger peer snapshot generation to use `cardano-cli-step1` in upgrade test runner script. --- cardano_node_tests/tests/test_node_upgrade.py | 22 ++++++++++--------- runner/node_upgrade_pytest.sh | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/cardano_node_tests/tests/test_node_upgrade.py b/cardano_node_tests/tests/test_node_upgrade.py index da3eae3c3..4f490209c 100644 --- a/cardano_node_tests/tests/test_node_upgrade.py +++ b/cardano_node_tests/tests/test_node_upgrade.py @@ -93,16 +93,7 @@ def test_ignore_log_errors( ): """Ignore selected errors in log right after node upgrade. - Test setup to ignore expected errors in node logs after upgrading from pre-UTxO-HD - releases. UTxO-HD was added in node 10.4.1. - - * Check if upgraded node version is < 10.5.0 - * If upgrading from pre-UTxO-HD release (node < 10.5.0): - - - Add log ignore rule for ChainDB warning about invalid snapshot - - Ignore "MetadataFileDoesNotExist" error in stdout logs - - * This prevents false test failures from expected upgrade-related log messages + This prevents false test failures from expected upgrade-related log messages. """ common.get_test_id(cluster_singleton) @@ -117,6 +108,17 @@ def test_ignore_log_errors( regex="ChainDB:Warning:.* Invalid snapshot DiskSnapshot .*MetadataFileDoesNotExist", ignore_file_id=worker_id, ) + # The error should be present only when upgrading pre LSM release. + # The LSM was added in 10.7.0, so when we are upgrading from 10.7.0+ release to + # 10.8.0+ release, the error should not be there. + # Here we are comparing the version of "upgraded" release, not the version we are upgrading + # from. + if VERSIONS.node < version.parse("10.8.0"): + logfiles.add_ignore_rule( + files_glob="*.stdout", + regex="tablesCodecVersion", + ignore_file_id=worker_id, + ) @allure.link(helpers.get_vcs_link()) @pytest.mark.skipif(UPGRADE_TESTS_STEP != 2, reason="runs only on step 2 of upgrade testing") diff --git a/runner/node_upgrade_pytest.sh b/runner/node_upgrade_pytest.sh index a60207d72..1f550cca0 100755 --- a/runner/node_upgrade_pytest.sh +++ b/runner/node_upgrade_pytest.sh @@ -236,7 +236,7 @@ elif [ "$1" = "step2" ]; then pytest cardano_node_tests/tests/test_node_upgrade.py -k test_update_cost_models || exit 6 # generate ledger peer snapshot using old node version - cardano-cli query ledger-peer-snapshot \ + cardano-cli-step1 query ledger-peer-snapshot \ --testnet-magic "$NETWORK_MAGIC" \ --socket-path "$STATE_CLUSTER/pool3.socket" \ --output-json \