From 564bb7e5c828f559d6900763cfaeef027cb34cc8 Mon Sep 17 00:00:00 2001 From: GuyAv46 Date: Thu, 2 Dec 2021 10:15:55 +0200 Subject: [PATCH 1/3] fix for circleci valgrind-cluster test: uses 6.2.5-x64-bullseye again --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 38cb35bb6..adebb7e28 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -346,7 +346,7 @@ jobs: type: string default: "CLUSTER=0" docker: - - image: redisfab/rmbuilder:6.0.9-x64-buster + - image: redisfab/rmbuilder:6.2.5-x64-bullseye steps: - abort_for_docs - abort_for_noci From b72c80edbd1e3aada0894338aff8004184aa792e Mon Sep 17 00:00:00 2001 From: GuyAv46 Date: Thu, 2 Dec 2021 10:17:18 +0200 Subject: [PATCH 2/3] fix the debug messege: will display the test-function name now --- tests/flow/tests_dag.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/flow/tests_dag.py b/tests/flow/tests_dag.py index 9d1402bce..d9a5fb465 100644 --- a/tests/flow/tests_dag.py +++ b/tests/flow/tests_dag.py @@ -21,7 +21,7 @@ def wrapper(env, *args, **kwargs): p = int(p) if (M < major) or (M == major and m < minor) or (M == major and m == minor and p < patch): env.debugPrint("skipping {0} since this test is for version {1}.{2}.{3} and above".format( - sys._getframe().f_code.co_name, major, minor, patch), force=True) + f.__name__, major, minor, patch), force=True) return return f(env, *args, **kwargs) return wrapper From b4c8e538cfb2795cb5eed61a23c82336317d0094 Mon Sep 17 00:00:00 2001 From: GuyAv46 Date: Thu, 2 Dec 2021 10:50:05 +0200 Subject: [PATCH 3/3] update valgrind test to 6.2 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index adebb7e28..43c382b3e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -176,7 +176,7 @@ commands: - run: name: Install dependencies command: | - ./opt/readies/bin/getredis -v 6.0 --valgrind --force + ./opt/readies/bin/getredis -v 6.2 --valgrind --force ./get_deps.sh cpu - run: name: Build for valgrind @@ -359,7 +359,7 @@ jobs: - run: name: Install dependencies command: | - ./opt/readies/bin/getredis -v 6.0 --valgrind --force + ./opt/readies/bin/getredis -v 6.2 --valgrind --force ./get_deps.sh cpu - run: name: Build for valgrind