From f63b83db6207a9eac5f4953481d3e16f1325e4b6 Mon Sep 17 00:00:00 2001 From: Brian Seeders Date: Tue, 29 Oct 2019 14:59:08 -0400 Subject: [PATCH] Add a couple more missing labels --- vars/kibanaPipeline.groovy | 11 +++++++---- vars/runbld.groovy | 5 ++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy index b401f731e075ed..358b320d5528ac 100644 --- a/vars/kibanaPipeline.groovy +++ b/vars/kibanaPipeline.groovy @@ -228,8 +228,11 @@ def sendKibanaMail() { } } -def bash(script) { - sh "#!/bin/bash\n${script}" +def bash(script, label="") { + sh( + script: "#!/bin/bash\n${script}", + label: label + ) } def doSetup() { @@ -245,10 +248,10 @@ def buildXpack() { } def runErrorReporter() { - bash """ + bash(""" source src/dev/ci_setup/setup_env.sh node scripts/report_failed_tests - """ + """, "Report failed tests, if necessary" } return this diff --git a/vars/runbld.groovy b/vars/runbld.groovy index ca03e77af2ae35..e5c209461fcf31 100644 --- a/vars/runbld.groovy +++ b/vars/runbld.groovy @@ -8,7 +8,10 @@ def call(script, label = "", enableJunitProcessing = false) { } def junit() { - sh "/usr/local/bin/runbld -d '${pwd()}' ${env.WORKSPACE}/kibana/test/scripts/jenkins_runbld_junit.sh" + sh( + script: "/usr/local/bin/runbld -d '${pwd()}' ${env.WORKSPACE}/kibana/test/scripts/jenkins_runbld_junit.sh", + label: "Process JUnit reports with runbld" + ) } return this