From c137292308db7aa11faec3134c4ac76bbbde1354 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Tue, 24 Jan 2023 17:51:18 -0700 Subject: [PATCH] LU-16228 tests: skip sanity/205e in interop tests Add a version check to sanity.sh test_205e and update the check in test_205d to match the actual patch version that lljobstat was landed in, so that it is not run during interop testing. Test-Parameters: trivial testlist=sanity env=ONLY=205 serverversion=EXA6.1.0 Fixes: e9f9822822 ("LU-16228 utils: add lljobstat util") Signed-off-by: Andreas Dilger Change-Id: I34d517c4b33e88f316cedbd94c8f48ace63ebbe5 Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/49756 Tested-by: jenkins --- lustre/tests/sanity.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 29afd81..d5d0cd6 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -18418,10 +18418,10 @@ run_test 205c "Verify client stats format" test_205d() { local file=$DIR/$tdir/$tfile - (( $MDS1_VERSION >= $(version_code 2.14.0) )) || - skip "need lustre >= 2.14.0" - (( $OST1_VERSION >= $(version_code 2.14.0) )) || - skip "need lustre >= 2.14.0" + (( $MDS1_VERSION >= $(version_code 2.14.0.73) )) || + skip "need lustre >= 2.14.0.73 for lljobstat" + (( $OST1_VERSION >= $(version_code 2.14.0.73) )) || + skip "need lustre >= 2.14.0.73 for lljobstat" verify_yaml_available || skip_env "YAML verification not installed" test_mkdir -i 0 $DIR/$tdir @@ -18453,6 +18453,10 @@ test_205e() { local ops_comma local file=$DIR/$tdir/$tfile + (( $MDS1_VERSION >= $(version_code 2.14.0.73) )) || + skip "need lustre >= 2.14.0.73 for lljobstat" + (( $OST1_VERSION >= $(version_code 2.14.0.73) )) || + skip "need lustre >= 2.14.0.73 for lljobstat" verify_yaml_available || skip_env "YAML verification not installed" mkdir_on_mdt0 $DIR/$tdir || error "failed to create dir" -- 1.8.3.1