Skip to content

Commit 405d1ac

Browse files
authored
DAOS-14658: Fix functional vm stage skip build param (#408)
Fix bug for Functional VM stages not honoring the skip build param value when run using getFunctionalTestStage(). Signed-off-by: Phil Henderson <[email protected]>
1 parent 5ebfb6d commit 405d1ac

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

vars/skipFunctionalTestStage.groovy

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
*/
1616
Map call(Map kwargs = [:]) {
1717
String tags = kwargs['tags'] ?: parseStageInfo()['test_tag']
18-
String pragma_suffix = kwargs['pragma_suffix'] ?: 'vm'
18+
String pragma_suffix = kwargs['pragma_suffix'] ?: '-vm'
1919
String size = pragma_suffix.replace('-hw-', '')
2020
String distro = kwargs['distro'] ?: hwDistroTarget(size)
21-
String build_param = "CI_${size.replace('-', '_')}_TEST"
21+
String build_param = (pragma_suffix == '-vm') ?
22+
"CI_FUNCTIONAL_${distro}_TEST" : "CI_${size.replace('-', '_')}_TEST"
2223
String build_param_value = paramsValue(build_param, '').toString()
2324
Boolean run_if_landing = kwargs['run_if_landing'] ?: false
2425
Boolean run_if_pr = kwargs['run_if_pr'] ?: false

0 commit comments

Comments
 (0)