Skip to content

Commit e6831a2

Browse files
Interpolate skipped test across all tags (#448)
Signed-off-by: Brian J. Murrell <[email protected]>
1 parent 57bff28 commit e6831a2

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

vars/packageBuildingPipelineDAOSTest.groovy

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -765,8 +765,11 @@ void call(Map pipeline_args) {
765765
build job: 'daos-stack/daos/' + setupDownstreamTesting.test_branch(env.TEST_BRANCH),
766766
parameters: [string(name: 'TestTag',
767767
value: ('load_mpi test_core_files ' +
768-
pipeline_args.get('test-tag', '')).trim() +
769-
skipped_tests_tags(env.TEST_BRANCH)),
768+
/* groovylint-disable-next-line LineLength */
769+
pipeline_args.get('test-tag', '')).trim().split(' ').collect {
770+
tag ->
771+
tag + skipped_tests_tags(env.TEST_BRANCH)
772+
}.join(' ')),
770773
string(name: 'CI_RPM_TEST_VERSION',
771774
value: pipeline_args.get('skip-build', true) ?
772775
daosLatestVersion(env.TEST_BRANCH, 'el8') : ''),
@@ -797,16 +800,16 @@ void call(Map pipeline_args) {
797800
' ' + cachedCommitPragma('PR-repos')),
798801
booleanParam(name: 'CI_RPM_el8_NOBUILD',
799802
value: pipeline_args.get('skip-build', true) ||
800-
! ('el8' in distros)),
803+
!('el8' in distros)),
801804
booleanParam(name: 'CI_RPM_el9_NOBUILD',
802805
value: pipeline_args.get('skip-build', true) ||
803-
! ('el9' in distros)),
806+
!('el9' in distros)),
804807
booleanParam(name: 'CI_RPM_leap15_NOBUILD',
805808
value: pipeline_args.get('skip-build', true) ||
806-
! ('leap15' in distros)),
809+
!('leap15' in distros)),
807810
booleanParam(name: 'CI_DEB_Ubuntu20_NOBUILD',
808811
value: pipeline_args.get('skip-build', true) ||
809-
! ('ubuntu20.04' in distros))
812+
!('ubuntu20.04' in distros))
810813
]
811814
} //steps
812815
post {

0 commit comments

Comments
 (0)