DAOS-15232 ci: support Test-tag and Features pragmas together (#425)

Support both Test-tag and Features pragmas by always looking for
Features and appending to the Test-tag

Signed-off-by: Dalton Bohning <[email protected]>

Author: daltonbohning

Jenkinsfile

@@ -546,16 +546,22 @@ pipeline {
                                        tag_template: '@commits.value@,@stages.tag@'],
                                        [tags: [[tag: 'Features', value: 'datamover']],
                                         tag_template: 'pr,@stages.tag@ ' +
+                                                      'pr,@commits.value@,@stages.tag@ ' +
                                                       'daily_regression,@commits.value@,@stages.tag@ ' +
                                                       'full_regression,@commits.value@,@stages.tag@'],
                                        /* groovylint-disable-next-line DuplicateMapLiteral */
                                        [tags: [[tag: 'Test-tag', value: 'datamover'],
                                                [tag: 'Features', value: 'foobar']],
-                                        tag_template: '@commits.value@,@stages.tag@'],
+                                        tag_template: '@commits.value@,@stages.tag@ ' +
+                                                      'pr,foobar,@stages.tag@ ' +
+                                                      'daily_regression,foobar,@stages.tag@ ' +
+                                                      'full_regression,foobar,@stages.tag@'],
                                        [tags: [[tag: 'Features', value: 'datamover foobar']],
                                         tag_template: 'pr,@stages.tag@ ' +
+                                                      'pr,datamover,@stages.tag@ ' +
                                                       'daily_regression,datamover,@stages.tag@ ' +
                                                       'full_regression,datamover,@stages.tag@ ' +
+                                                      'pr,foobar,@stages.tag@ ' +
                                                       'daily_regression,foobar,@stages.tag@ ' +
                                                       'full_regression,foobar,@stages.tag@'],
                                        [tags: [[tag: 'Test-tag', value: 'datamover foobar']],

vars/getFunctionalTags.groovy

@@ -14,7 +14,7 @@
 Map call(Map kwargs = [:]) {
     String pragma_suffix = kwargs.get('pragma_suffix', getPragmaSuffix())
     String stage_tags = kwargs.get('stage_tags', getFunctionalStageTags())
-    String default_tags = kwargs.get('default_tags', '')
+    String default_tags = kwargs.get('default_tags', 'pr')
     String requested_tags = ''
 
     // Define the test tags to use in this stage
@@ -30,22 +30,21 @@ Map call(Map kwargs = [:]) {
         // Builds started from a commit should first use any commit pragma 'Test-tag*:' tags if defined
         requested_tags = commitPragma('Test-tag' + pragma_suffix, commitPragma('Test-tag', ''))
     }
-    if (!requested_tags) {
-        // Builds started from a commit should then use any commit pragma 'Features:' tags if defined
-        String features = commitPragma('Features', '')
-        if (features) {
-            // Features extend the standard pr testing tags to include tests run in daily or weekly builds
-            // that test the specified feature.
-            requested_tags = 'pr'
-            for (feature in features.split(' ')) {
-                requested_tags += ' daily_regression,' + feature + ' full_regression,' + feature
-            }
-        }
-    }
     if (!requested_tags) {
         // Builds started from a commit should finally use the default tags for the stage
         requested_tags = default_tags
     }
+
+    // Append any commit pragma 'Features:' tags if defined
+    String features = commitPragma('Features', '')
+    if (features) {
+        // Features extend the standard testing tags to include tests run in pr, daily, or weekly builds
+        // that test the specified feature.
+        // We should eventually not need to filter by pr, daily, weekly when all tests are tagged appropriately.
+        for (feature in features.split(' ')) {
+            requested_tags += ' pr,' + feature + ' daily_regression,' + feature + ' full_regression,' + feature
+        }
+    }
     if (requested_tags) {
         requested_tags = requested_tags.trim()
     }