SRE-1975 test: replace -hw with vm (#421)

All VM tests in master and 2.4 are tagged with "vm", so you "vm" instead
of "-hw".

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

Author: daltonbohning

Jenkinsfile

@@ -535,7 +535,7 @@ pipeline {
                         // lots more test cases could be cooked up, to be sure
                         script {
                             stages = [[name: 'Fake CentOS 7 Functional stage',
-                                       tag: '-hw'],
+                                       tag: 'vm'],
                                       [name: 'Fake CentOS 7 Functional Hardware Medium stage',
                                        tag: 'hw,medium,-provider'],
                                       [name: 'Fake CentOS 7 Functional Hardware Medium Provider stage',
@@ -577,10 +577,7 @@ pipeline {
                                              'COMMIT_MESSAGE=' + cm.stripIndent()]) {
                                         cmp = commit.tag_template.replace('@commits.value@', commit.tags[0].value)
                                         cmp = cmp.replace('@stages.tag@', stage.tag)
-                                        // Useful for debugging since Jenkins'
-                                        // assert() is pretty lame
-                                        // println('assert(' + parseStageInfo()['test_tag'] + " == ${cmp})")
-                                        assert(parseStageInfo()['test_tag'] == cmp)
+                                        assert(parseStageInfo()['test_tag'] == cmp), parseStageInfo()['test_tag'] + ' != ' + cmp
                                     }
                                 }
                             }

vars/getFunctionalStageTags.groovy

@@ -13,8 +13,7 @@
     String stage_tags = ''
 
     if (stage_name.contains('Functional')) {
-        // stage_tags = 'vm'
-        stage_tags = '-hw'
+        stage_tags = 'vm'
         if (stage_name.contains('Hardware')) {
             stage_tags = 'hw,large'
             if (stage_name.contains('Small')) {