From: Ben Evans Date: Tue, 20 Nov 2018 20:40:20 +0000 (-0500) Subject: LU-11684 config: fix conf-sanity test_123 X-Git-Tag: 2.12.0-RC2~2 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=73be3386684f35ad401f0d57be90cea61327aee8 LU-11684 config: fix conf-sanity test_123 conf_param parameters go into FSNAME-MDT/OST/client files set_parm -P parameters go into "params" Change the test to set the conf_param parameter files first followed by the set_param -P parameters, since there may be overlap. In this case, the test infrastructure is using conf_param to set jobid_var, and test_123 is using set_param. This causes collision and occasional failure. Test-Parameters: trivial testlist=conf-sanity Signed-off-by: Ben Evans Change-Id: I5cbdbaf6cc0c1c55a870bd587e89b2cbdaf77c29 Reviewed-on: https://review.whamcloud.com/33720 Tested-by: Jenkins Reviewed-by: James Simmons Tested-by: Maloo Reviewed-by: Andreas Dilger --- diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 0f5cafc..59fa294 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -8238,7 +8238,7 @@ test_123() { local orig_val=$(do_facet mgs $LCTL get_param jobid_var) do_facet mgs $LCTL set_param -P jobid_var="testname" - for i in params $cfgfiles; do + for i in $cfgfiles params; do do_facet mgs "lctl --device MGS llog_print ${i} >> $yaml_file" done