From 0b615ebc1a749ad45b820081a0c4c9852a689bcd Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Thu, 24 Nov 2022 19:28:21 -0700 Subject: [PATCH] LU-12016 tests: skip sanity/156 in interop Since LU-12071 was backported to b_es5_2 the version check on b_es6_0 is incorrect and this part of the test_156 should be skipped. Test-Parameters: trivial testlist=sanity env=ONLY=156 serverversion=EXA5 Fixes: 3043c6f189 ("LU-12071 osd-ldiskfs: bypass pagecache if requested") Signed-off-by: Andreas Dilger Change-Id: I3fd96578e36675655fb265d83ba3f661950ab112 Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/49246 Tested-by: jenkins Tested-by: Maloo --- lustre/tests/sanity.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index d63526d..858cef8 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -15370,8 +15370,8 @@ test_156() { log "cache hits:: before: $BEFORE, after: $AFTER" fi - if [ $OST1_VERSION -lt $(version_code 2.12.55) ]; then - # > 2.12.56 uses pagecache if cached + if [ $OST1_VERSION -lt $(version_code 2.12.3) ]; then + # > 2.12.3 uses pagecache if cached log "Read again; it should not be satisfied from the cache." BEFORE=$AFTER cancel_lru_locks osc @@ -15397,8 +15397,8 @@ test_156() { log "cache hits:: before: $BEFORE, after: $AFTER" fi - if [ $OST1_VERSION -lt $(version_code 2.12.55) ]; then - # > 2.12.56 uses pagecache if cached + if [ $OST1_VERSION -lt $(version_code 2.12.3) ]; then + # > 2.12.3 uses pagecache if cached log "Read again; it should not be satisfied from the cache." BEFORE=$AFTER cancel_lru_locks osc -- 1.8.3.1