From ca3f7774e73614bf9f031ecc64b85d547bdd2bf9 Mon Sep 17 00:00:00 2001 From: Phil Henderson Date: Mon, 4 Dec 2023 15:05:52 -0500 Subject: [PATCH] DAOS-14658: Fix functional vm stage skip build param Fix bug for Functional VM stages not honoring the skip build param value when run using getFunctionalTestStage(). Skip-func-hw-test: true Signed-off-by: Phil Henderson --- vars/skipFunctionalTestStage.groovy | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vars/skipFunctionalTestStage.groovy b/vars/skipFunctionalTestStage.groovy index d7e2f1e46..ea3a2e2be 100644 --- a/vars/skipFunctionalTestStage.groovy +++ b/vars/skipFunctionalTestStage.groovy @@ -15,10 +15,11 @@ */ Map call(Map kwargs = [:]) { String tags = kwargs['tags'] ?: parseStageInfo()['test_tag'] - String pragma_suffix = kwargs['pragma_suffix'] ?: 'vm' + String pragma_suffix = kwargs['pragma_suffix'] ?: '-vm' String size = pragma_suffix.replace('-hw-', '') String distro = kwargs['distro'] ?: hwDistroTarget(size) - String build_param = "CI_${size.replace('-', '_')}_TEST" + String build_param = (pragma_suffix == '-vm') ? + "CI_FUNCTIONAL_${distro}_TEST" : "CI_${size.replace('-', '_')}_TEST" String build_param_value = paramsValue(build_param, '').toString() Boolean run_if_landing = kwargs['run_if_landing'] ?: false Boolean run_if_pr = kwargs['run_if_pr'] ?: false