From 7fbf33ea465682ee62a23ccd2629b3560d69dd16 Mon Sep 17 00:00:00 2001 From: Phil Henderson Date: Tue, 12 Mar 2024 08:58:31 -0400 Subject: [PATCH 1/5] 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/5] 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 = '''\ From 67f72bc39d16ad1fe85ca38e16a5a4c65495dded Mon Sep 17 00:00:00 2001 From: Phil Henderson Date: Wed, 29 Apr 2026 16:59:44 -0400 Subject: [PATCH 3/5] Fix multiple Test-tag entries in commit messages. Signed-off-by: Phil Henderson --- vars/getFunctionalTags.groovy | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/getFunctionalTags.groovy b/vars/getFunctionalTags.groovy index 25ec16ceb..8ad50f777 100644 --- a/vars/getFunctionalTags.groovy +++ b/vars/getFunctionalTags.groovy @@ -35,6 +35,9 @@ Map call(Map kwargs = [:]) { // Builds started from a commit should finally use the default tags for the stage requested_tags = requested_tags ?: default_tags + // Replace any newlines with spaces + requested_tags = requested_tags.replaceAll(/\r?\n/, ' ') + // Append any commit pragma 'Features:' tags if defined String features = commitPragma('Features', '') if (features) { From b43152214042c9275f881afc033768ea0d7c1801 Mon Sep 17 00:00:00 2001 From: Phil Henderson Date: Wed, 29 Apr 2026 17:08:06 -0400 Subject: [PATCH 4/5] Debug Signed-off-by: Phil Henderson --- vars/getFunctionalTags.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/getFunctionalTags.groovy b/vars/getFunctionalTags.groovy index 8ad50f777..a25350f05 100644 --- a/vars/getFunctionalTags.groovy +++ b/vars/getFunctionalTags.groovy @@ -36,6 +36,7 @@ Map call(Map kwargs = [:]) { requested_tags = requested_tags ?: default_tags // Replace any newlines with spaces + echo "getFunctionalTags: Requested tags before formatting: '${requested_tags}'" requested_tags = requested_tags.replaceAll(/\r?\n/, ' ') // Append any commit pragma 'Features:' tags if defined From 4a3b88f9fcbc7c029e51f968ba3544be6035aa28 Mon Sep 17 00:00:00 2001 From: Phil Henderson Date: Wed, 29 Apr 2026 17:23:02 -0400 Subject: [PATCH 5/5] Cleanup Signed-off-by: Phil Henderson --- vars/getFunctionalTags.groovy | 4 ---- 1 file changed, 4 deletions(-) diff --git a/vars/getFunctionalTags.groovy b/vars/getFunctionalTags.groovy index a25350f05..25ec16ceb 100644 --- a/vars/getFunctionalTags.groovy +++ b/vars/getFunctionalTags.groovy @@ -35,10 +35,6 @@ Map call(Map kwargs = [:]) { // Builds started from a commit should finally use the default tags for the stage requested_tags = requested_tags ?: default_tags - // Replace any newlines with spaces - echo "getFunctionalTags: Requested tags before formatting: '${requested_tags}'" - requested_tags = requested_tags.replaceAll(/\r?\n/, ' ') - // Append any commit pragma 'Features:' tags if defined String features = commitPragma('Features', '') if (features) {