From 7fbf33ea465682ee62a23ccd2629b3560d69dd16 Mon Sep 17 00:00:00 2001 From: Phil Henderson Date: Tue, 12 Mar 2024 08:58:31 -0400 Subject: [PATCH 1/2] SRE-322 ci: Support multi-line Test-tag commit pragmas Adding unit test for specifying the Test-tag commit pragma on multiple lines and expecting the values to be concatenated. Skip-daos-build-and-test: true Signed-off-by: Phil Henderson --- Jenkinsfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7fd42db0d..be7dcd6ff 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -565,7 +565,13 @@ pipeline { 'daily_regression,foobar,@stages.tag@ ' + 'full_regression,foobar,@stages.tag@'], [tags: [[tag: 'Test-tag', value: 'datamover foobar']], - tag_template: 'datamover,@stages.tag@ foobar,@stages.tag@']] + tag_template: 'datamover,@stages.tag@ foobar,@stages.tag@'], + [tags: [[tag: 'Test-tag', value: 'line1'], + [tag: 'Test-tag', value: 'line2'], + [tag: 'Test-tag', value: 'line3'], + [tag: 'Test-tag', value: 'line4'],], + tag_template: 'line1,@stages.tag@ line2,@stages.tag@' + + 'line3,@stages.tag@ line4,@stages.tag@']] commits.each { commit -> cm = '''\ Test commit\n''' From 834b0ac41e8f0275112a45aaf2fa7fe8aac0b438 Mon Sep 17 00:00:00 2001 From: Phil Henderson Date: Wed, 13 Mar 2024 15:51:45 -0400 Subject: [PATCH 2/2] Fix expected tags for multi-line commit pragmas Skip-daos-build-and-test: true Signed-off-by: Phil Henderson --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index be7dcd6ff..0444242c9 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -570,7 +570,7 @@ pipeline { [tag: 'Test-tag', value: 'line2'], [tag: 'Test-tag', value: 'line3'], [tag: 'Test-tag', value: 'line4'],], - tag_template: 'line1,@stages.tag@ line2,@stages.tag@' + + tag_template: 'line1,@stages.tag@ line2,@stages.tag@ ' + 'line3,@stages.tag@ line4,@stages.tag@']] commits.each { commit -> cm = '''\