From 0395eb896367a2dc4778c2fdde07b8206b1a32d8 Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Thu, 6 Aug 2020 13:53:38 +0100
Subject: [PATCH] fixes The most common cause is that Jenkins and runbld are
 configured with different working directories

---
 .ci/Jenkinsfile | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index 7ed8b513304..014704f6db5 100644
--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@ -400,31 +400,26 @@ def runbld() {
   catchError(buildResult: 'SUCCESS', message: 'runbld post build action failed.') {
     if (stashedTestReports) {
       def jobName = 'elastic+beats'
-      // TODO: change ansible/roles/runbld/templates/runbld.conf.j2
-      def where = ''
       if (isPR()) {
         jobName = 'elastic+beats+pull-request'
-        where = env.BASE_DIR
       }
       deleteDir()
       unstashV2(name: 'source', bucket: "${JOB_GCS_BUCKET}", credentialsId: "${JOB_GCS_CREDENTIALS}")
-      dir("${where}") {
-        // Unstash the test reports
-        stashedTestReports.each { k, v ->
-          dir(k) {
-            unstash(v)
-          }
+      // Unstash the test reports
+      stashedTestReports.each { k, v ->
+        dir(k) {
+          unstash(v)
         }
-        sh(label: 'Process JUnit reports with runbld',
-          script: """\
-          ## for debugging purposes
-          find . -name "TEST-*.xml"
-          cat >./runbld-script <<EOF
-          echo "Processing JUnit reports with runbld..."
-          EOF
-          /usr/local/bin/runbld ./runbld-script --job-name ${jobName}
-          """.stripIndent())  // stripIdent() requires '''/
       }
+      sh(label: 'Process JUnit reports with runbld',
+        script: """\
+        ## for debugging purposes
+        find . -name "TEST-*.xml"
+        cat >./runbld-script <<EOF
+        echo "Processing JUnit reports with runbld..."
+        EOF
+        /usr/local/bin/runbld ./runbld-script --job-name ${jobName}
+        """.stripIndent())  // stripIdent() requires '''/
     }
   }
 }