Force labels for runbld/bash methods and add missing labels

elastic · Oct 31, 2019 · db5f40b · db5f40b
1 parent 42e5e5e
commit db5f40b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.ci/Jenkinsfile_flaky b/.ci/Jenkinsfile_flaky
@@ -34,7 +34,7 @@ stage("Kibana Pipeline") {
                 if (!IS_XPACK) {
                   kibanaPipeline.buildOss()
                   if (CI_GROUP == '1') {
-                    runbld "./test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh"
+                    runbld("./test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
                   }
                 } else {
                   kibanaPipeline.buildXpack()
@@ -62,18 +62,18 @@ stage("Kibana Pipeline") {
 def getWorkerFromParams(isXpack, job, ciGroup) {
   if (!isXpack) {
     if (job == 'firefoxSmoke') {
-      return kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld './test/scripts/jenkins_firefox_smoke.sh' })
+      return kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke') })
     } else if(job == 'visualRegression') {
-      return kibanaPipeline.getPostBuildWorker('visualRegression', { runbld './test/scripts/jenkins_visual_regression.sh' })
+      return kibanaPipeline.getPostBuildWorker('visualRegression', { runbld('./test/scripts/jenkins_visual_regression.sh', 'Execute kibana-visualRegression') })
     } else {
       return kibanaPipeline.getOssCiGroupWorker(ciGroup)
     }
   }
 
   if (job == 'firefoxSmoke') {
-    return kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld './test/scripts/jenkins_xpack_firefox_smoke.sh' })
+    return kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld('./test/scripts/jenkins_xpack_firefox_smoke.sh', 'Execute xpack-firefoxSmoke') })
   } else if(job == 'visualRegression') {
-    return kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld './test/scripts/jenkins_xpack_visual_regression.sh' })
+    return kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld('./test/scripts/jenkins_xpack_visual_regression.sh', 'Execute xpack-visualRegression') })
   } else {
     return kibanaPipeline.getXpackCiGroupWorker(ciGroup)
   }

diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
@@ -228,7 +228,7 @@ def sendKibanaMail() {
   }
 }
 
-def bash(script, label="") {
+def bash(script) {
   sh(
     script: "#!/bin/bash\n${script}",
     label: label

diff --git a/vars/runbld.groovy b/vars/runbld.groovy
@@ -1,4 +1,4 @@
-def call(script, label = "", enableJunitProcessing = false) {
+def call(script, label, enableJunitProcessing = false) {
   def extraConfig = enableJunitProcessing ? "" : "--config ${env.WORKSPACE}/kibana/.ci/runbld_no_junit.yml"
 
   sh(