Skip build pragma does not work

Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@hpe.com>

Cancel-prev-build: false
Priority: 2

Skip-python-bandit: true

Skip-build-leap15-gcc: true
Skip-build-leap15-icc: true

Skip-unit-tests:true

Skip-func-test-vm-valgrind: false

Skip-func-hw-test: true

Author: grom72

Jenkinsfile

@@ -200,20 +200,24 @@ Boolean skip_build_stage(String distro='', String compiler='gcc') {
         }
     }
 
-    // Skip the stage if any Skip-build-<distro>-<compiler> pragmas are true
+    // Skip the stage if any Skip-build[-<distro>-<compiler>] pragmas are true
     List<String> pragma_names = ['build']
     if (distro && compiler) {
         pragma_names << "build-${distro}-${compiler}"
-        println("pragma_name: build-${distro}-${compiler}")
     }
+    Boolean skip_due_to_pragma = false
     pragma_names.each { name ->
         if (skip_pragma_set(name)) {
-            println("[DEBUG] skip_pragma_set('${name}') == true")
-            return true
+            println("[${env.STAGE_NAME}] Skipping build stage due to Skip-${name} pragma")
+            skip_due_to_pragma = true
+            return
         } else {
             println("[DEBUG] skip_pragma_set('${name}') == false")
         }
     }
+    if (skip_due_to_pragma) {
+        return true
+    }
     // Skip the stage if a specific DAOS RPM version is specified
     if (rpmTestVersion() != '') {
         println("[${env.STAGE_NAME}] Skipping build stage for due to specific DAOS RPM version")