fix 'enable'

Mellanox · Apr 9, 2021 · dd78c68 · dd78c68
1 parent f351292
commit dd78c68
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/.ci/examples/job_matrix_env.yaml b/.ci/examples/job_matrix_env.yaml
@@ -43,4 +43,15 @@ steps:
   run: |
     hostname
     env
-    
+
+- name: step4-disabled
+  enable: false
+  run: |
+    hostname
+    env
+
+- name: step5-enabled
+  enable: true
+  run: |
+    hostname
+    env
diff --git a/src/com/mellanox/cicd/Matrix.groovy b/src/com/mellanox/cicd/Matrix.groovy
@@ -427,9 +427,9 @@ def stringToList(selector) {
 
 def check_skip_stage(image, config, title, oneStep, axis) {
 
-    def stepEnabled = getConfigVal(config, ['enable'], true, true, oneStep, true) + ''
+    def stepEnabled = getConfigVal(config, ['enable'], true, true, oneStep, true).toString()
 
-    if (stepEnabled == 'false') {
+    if (!stepEnabled.toBoolean()) {
         config.logger.trace(2, "Step '${oneStep.name}' is disabled in project yaml file, skipping")
         return true
     }
@@ -680,7 +680,7 @@ spec:
 
 @NonCPS
 def replaceVars(vars, str) {
-    def res = str
+    def res = str.toString()
 
     for (def entry in entrySet(vars)) {