From c523424559077495c87b501e8f0489cd18c21e57 Mon Sep 17 00:00:00 2001
From: kuisathaverat <kuisathaverat@yahoo.com>
Date: Thu, 14 Jan 2021 19:41:16 +0100
Subject: [PATCH 1/9] test: use filebeat step to grab Docker logs

---
 .ci/integrationTestDownstream.groovy |  5 ++++-
 .ci/integrationTestEC.groovy         | 10 ++++-----
 .ci/integrationTestECK.groovy        |  6 +++--
 .ci/integrationTestSelector.groovy   | 33 +++++++++++++++++-----------
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/.ci/integrationTestDownstream.groovy b/.ci/integrationTestDownstream.groovy
index 361a8bdbd..a847b3fb3 100644
--- a/.ci/integrationTestDownstream.groovy
+++ b/.ci/integrationTestDownstream.groovy
@@ -185,8 +185,11 @@ class IntegrationTestingParallelTaskGenerator extends DefaultParallelTaskGenerat
           "TMPDIR=${steps.env.WORKSPACE}"
           ]
         def label = "${tag}-${x}-${y}"
+        def dockerLogs = label.replace(":","_").replace(";","_").replace(" ","").replace("--","-")
         try{
-          steps.runScript(label: label, agentType: tag, env: env)
+          fielbeat(output: "${dockerLogs}.log", archiveOnlyOnFail: true){
+            steps.runScript(label: label, agentType: tag, env: env)
+          }
           saveResult(x, y, 1)
         } catch (e){
           saveResult(x, y, 0)
diff --git a/.ci/integrationTestEC.groovy b/.ci/integrationTestEC.groovy
index 07a299fe1..c915918a2 100644
--- a/.ci/integrationTestEC.groovy
+++ b/.ci/integrationTestEC.groovy
@@ -199,8 +199,10 @@ def runTest(test){
   unstash 'source'
   withConfigEnv(){
     catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-      dir("${BASE_DIR}"){
-        sh ".ci/scripts/${test}.sh"
+      fielbeat(output: "${dockerLogs}.log", archiveOnlyOnFail: true){
+        dir("${BASE_DIR}"){
+          sh ".ci/scripts/${test}.sh"
+        }
       }
     }
   }
@@ -262,10 +264,6 @@ def withConfigEnv(Closure body) {
 def grabResultsAndLogs(label){
   withConfigEnv(){
     dir("${BASE_DIR}"){
-      if(currentBuild.result == 'FAILURE' || currentBuild.result == 'UNSTABLE'){
-        dockerLogs(step: label, failNever: true)
-        sh('.ci/scripts/remove_env.sh docker-info')
-      }
       sh('make stop-env || echo 0')
       archiveArtifacts(
           allowEmptyArchive: true,
diff --git a/.ci/integrationTestECK.groovy b/.ci/integrationTestECK.groovy
index d67d47a1f..2aee44a97 100644
--- a/.ci/integrationTestECK.groovy
+++ b/.ci/integrationTestECK.groovy
@@ -215,8 +215,10 @@ def runTest(test){
   unstash 'source'
   withConfigEnv(){
     catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-      dir("${BASE_DIR}"){
-        sh ".ci/scripts/${test}.sh"
+      fielbeat(output: "${dockerLogs}.log", archiveOnlyOnFail: true){
+        dir("${BASE_DIR}"){
+          sh ".ci/scripts/${test}.sh"
+        }
       }
     }
   }
diff --git a/.ci/integrationTestSelector.groovy b/.ci/integrationTestSelector.groovy
index 07b0b68c7..34615492b 100644
--- a/.ci/integrationTestSelector.groovy
+++ b/.ci/integrationTestSelector.groovy
@@ -76,8 +76,10 @@ pipeline {
           steps {
             deleteDir()
             unstash "source"
-            dir("${BASE_DIR}"){
-              sh(label: "Testing ${NAME} ${APP}", script: ".ci/scripts/agent.sh ${NAME} ${APP}")
+            fielbeat(output: "${NAME}-${APP}-docker.log", archiveOnlyOnFail: true){
+              dir("${BASE_DIR}"){
+                sh(label: "Testing ${NAME} ${APP}", script: ".ci/scripts/agent.sh ${NAME} ${APP}")
+              }
             }
           }
           post {
@@ -97,8 +99,10 @@ pipeline {
           steps {
             deleteDir()
             unstash "source"
-            dir("${BASE_DIR}"){
-              sh(label: "Testing ${NAME} ${OPBEANS_APP}", script: ".ci/scripts/opbeans-app.sh ${NAME} ${APP} ${OPBEANS_APP}")
+            fielbeat(output: "${OPBEANS_APP}-docker.log", archiveOnlyOnFail: true){
+              dir("${BASE_DIR}"){
+                sh(label: "Testing ${NAME} ${OPBEANS_APP}", script: ".ci/scripts/opbeans-app.sh ${NAME} ${APP} ${OPBEANS_APP}")
+              }
             }
           }
           post {
@@ -122,8 +126,10 @@ pipeline {
               sh script: ".ci/bump-version.sh ${env.BUILD_OPTS.replaceAll('--rum-agent-branch ', '')} false", label: 'Bump version'
               sh script: 'make build', label: 'Build docker image with the new rum agent'
             }
-            dir("${BASE_DIR}"){
-              sh(label: 'Testing RUM', script: '.ci/scripts/opbeans-rum.sh')
+            fielbeat(output: "opbeans-rum-docker.log", archiveOnlyOnFail: true){
+              dir("${BASE_DIR}"){
+                sh(label: 'Testing RUM', script: '.ci/scripts/opbeans-rum.sh')
+              }
             }
           }
           post {
@@ -147,8 +153,10 @@ pipeline {
       steps {
         deleteDir()
         unstash "source"
-        dir("${BASE_DIR}"){
-          sh ".ci/scripts/all.sh"
+        fielbeat(output: "all-docker.log", archiveOnlyOnFail: true){
+          dir("${BASE_DIR}"){
+            sh ".ci/scripts/all.sh"
+          }
         }
       }
       post {
@@ -196,8 +204,10 @@ pipeline {
       steps {
         deleteDir()
         unstash "source"
-        dir("${BASE_DIR}"){
-          sh ".ci/scripts/opbeans.sh"
+        fielbeat(output: "opbeans-docker.log", archiveOnlyOnFail: true){
+          dir("${BASE_DIR}"){
+            sh ".ci/scripts/opbeans.sh"
+          }
         }
       }
       post {
@@ -218,9 +228,6 @@ pipeline {
 def wrappingup(Map params = [:]){
   def isJunit = params.containsKey('isJunit') ? params.get('isJunit') : true
   dir("${BASE_DIR}"){
-    if(currentBuild.result == 'FAILURE' || currentBuild.result == 'UNSTABLE'){
-      dockerLogs(step: "${env.NAME}", failNever: true)
-    }
     sh('make stop-env || echo 0')
     def testResultsPattern = 'tests/results/*-junit*.xml'
     archiveArtifacts(

From 74292c97faad86cabfb024278183477f8a67a989 Mon Sep 17 00:00:00 2001
From: Ivan Fernandez Calvo <kuisathaverat@yahoo.com>
Date: Wed, 20 Jan 2021 14:30:22 +0100
Subject: [PATCH 2/9] fix: move filebeat step to runScript

---
 .ci/integrationTestDownstream.groovy | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.ci/integrationTestDownstream.groovy b/.ci/integrationTestDownstream.groovy
index a847b3fb3..2685e2581 100644
--- a/.ci/integrationTestDownstream.groovy
+++ b/.ci/integrationTestDownstream.groovy
@@ -114,8 +114,10 @@ pipeline {
       steps {
         deleteDir()
         unstash "source"
-        dir("${BASE_DIR}"){
-          sh ".ci/scripts/all.sh"
+        fielbeat(output: "${dockerLogs}.log", archiveOnlyOnFail: true){
+          dir("${BASE_DIR}"){
+            sh ".ci/scripts/all.sh"
+          }
         }
       }
       post {
@@ -187,9 +189,7 @@ class IntegrationTestingParallelTaskGenerator extends DefaultParallelTaskGenerat
         def label = "${tag}-${x}-${y}"
         def dockerLogs = label.replace(":","_").replace(";","_").replace(" ","").replace("--","-")
         try{
-          fielbeat(output: "${dockerLogs}.log", archiveOnlyOnFail: true){
-            steps.runScript(label: label, agentType: tag, env: env)
-          }
+          steps.runScript(label: label, agentType: tag, env: env)
           saveResult(x, y, 1)
         } catch (e){
           saveResult(x, y, 0)
@@ -214,9 +214,11 @@ def runScript(Map params = [:]){
   log(level: 'INFO', text: "${label}")
   deleteDir()
   unstash "source"
-  dir("${BASE_DIR}"){
-    withEnv(env){
-      sh(label: "Testing ${agentType}", script: ".ci/scripts/${agentType}.sh")
+  fielbeat(output: "${dockerLogs}.log", archiveOnlyOnFail: true){
+    dir("${BASE_DIR}"){
+      withEnv(env){
+        sh(label: "Testing ${agentType}", script: ".ci/scripts/${agentType}.sh")
+      }
     }
   }
 }

From 04194da16be63e2a391e78eced097ed18c2e4c57 Mon Sep 17 00:00:00 2001
From: Ivan Fernandez Calvo <kuisathaverat@yahoo.com>
Date: Wed, 20 Jan 2021 15:31:11 +0100
Subject: [PATCH 3/9] refactor

---
 .ci/integrationTestDownstream.groovy | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.ci/integrationTestDownstream.groovy b/.ci/integrationTestDownstream.groovy
index 2685e2581..816dff2b7 100644
--- a/.ci/integrationTestDownstream.groovy
+++ b/.ci/integrationTestDownstream.groovy
@@ -187,13 +187,10 @@ class IntegrationTestingParallelTaskGenerator extends DefaultParallelTaskGenerat
           "TMPDIR=${steps.env.WORKSPACE}"
           ]
         def label = "${tag}-${x}-${y}"
-        def dockerLogs = label.replace(":","_").replace(";","_").replace(" ","").replace("--","-")
         try{
+          saveResult(x, y, 0)
           steps.runScript(label: label, agentType: tag, env: env)
           saveResult(x, y, 1)
-        } catch (e){
-          saveResult(x, y, 0)
-          steps.error("${label} tests failed : ${e.toString()}\n")
         } finally {
           steps.wrappingup(label)
         }
@@ -211,6 +208,7 @@ def runScript(Map params = [:]){
   def label = params.containsKey('label') ? params.label : params?.agentType
   def agentType = params.agentType
   def env = params.env
+  def dockerLogs = label.replace(":","_").replace(";","_").replace(" ","").replace("--","-")
   log(level: 'INFO', text: "${label}")
   deleteDir()
   unstash "source"

From 105f6a5c06d1179928f79510f4fb9f73aee10c64 Mon Sep 17 00:00:00 2001
From: Ivan Fernandez Calvo <kuisathaverat@yahoo.com>
Date: Wed, 20 Jan 2021 17:28:59 +0100
Subject: [PATCH 4/9] test: chekc is correct executed

---
 .ci/integrationTestDownstream.groovy | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.ci/integrationTestDownstream.groovy b/.ci/integrationTestDownstream.groovy
index 816dff2b7..b6d5753d6 100644
--- a/.ci/integrationTestDownstream.groovy
+++ b/.ci/integrationTestDownstream.groovy
@@ -49,6 +49,8 @@ pipeline {
     stage('Checkout'){
       options { skipDefaultCheckout() }
       steps {
+        echo "Correct PR"
+        sh('git show-ref')
         deleteDir()
         gitCheckout(basedir: "${BASE_DIR}",
           branch: "${params.INTEGRATION_TESTING_VERSION}",

From b3e711d94f439b591f82329effb0e9fa86b6f3a1 Mon Sep 17 00:00:00 2001
From: Ivan Fernandez Calvo <kuisathaverat@yahoo.com>
Date: Wed, 20 Jan 2021 18:27:24 +0100
Subject: [PATCH 5/9] fix: typo

---
 .ci/integrationTestDownstream.groovy |  2 +-
 .ci/integrationTestEC.groovy         |  2 +-
 .ci/integrationTestECK.groovy        |  2 +-
 .ci/integrationTestSelector.groovy   | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.ci/integrationTestDownstream.groovy b/.ci/integrationTestDownstream.groovy
index b6d5753d6..5e715adff 100644
--- a/.ci/integrationTestDownstream.groovy
+++ b/.ci/integrationTestDownstream.groovy
@@ -214,7 +214,7 @@ def runScript(Map params = [:]){
   log(level: 'INFO', text: "${label}")
   deleteDir()
   unstash "source"
-  fielbeat(output: "${dockerLogs}.log", archiveOnlyOnFail: true){
+  filebeat(output: "${dockerLogs}.log", archiveOnlyOnFail: true){
     dir("${BASE_DIR}"){
       withEnv(env){
         sh(label: "Testing ${agentType}", script: ".ci/scripts/${agentType}.sh")
diff --git a/.ci/integrationTestEC.groovy b/.ci/integrationTestEC.groovy
index c915918a2..21234a4ae 100644
--- a/.ci/integrationTestEC.groovy
+++ b/.ci/integrationTestEC.groovy
@@ -199,7 +199,7 @@ def runTest(test){
   unstash 'source'
   withConfigEnv(){
     catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-      fielbeat(output: "${dockerLogs}.log", archiveOnlyOnFail: true){
+      filebeat(output: "${dockerLogs}.log", archiveOnlyOnFail: true){
         dir("${BASE_DIR}"){
           sh ".ci/scripts/${test}.sh"
         }
diff --git a/.ci/integrationTestECK.groovy b/.ci/integrationTestECK.groovy
index 2aee44a97..d5b3bb665 100644
--- a/.ci/integrationTestECK.groovy
+++ b/.ci/integrationTestECK.groovy
@@ -215,7 +215,7 @@ def runTest(test){
   unstash 'source'
   withConfigEnv(){
     catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-      fielbeat(output: "${dockerLogs}.log", archiveOnlyOnFail: true){
+      filebeat(output: "${dockerLogs}.log", archiveOnlyOnFail: true){
         dir("${BASE_DIR}"){
           sh ".ci/scripts/${test}.sh"
         }
diff --git a/.ci/integrationTestSelector.groovy b/.ci/integrationTestSelector.groovy
index 34615492b..c3c27a572 100644
--- a/.ci/integrationTestSelector.groovy
+++ b/.ci/integrationTestSelector.groovy
@@ -76,7 +76,7 @@ pipeline {
           steps {
             deleteDir()
             unstash "source"
-            fielbeat(output: "${NAME}-${APP}-docker.log", archiveOnlyOnFail: true){
+            filebeat(output: "${NAME}-${APP}-docker.log", archiveOnlyOnFail: true){
               dir("${BASE_DIR}"){
                 sh(label: "Testing ${NAME} ${APP}", script: ".ci/scripts/agent.sh ${NAME} ${APP}")
               }
@@ -99,7 +99,7 @@ pipeline {
           steps {
             deleteDir()
             unstash "source"
-            fielbeat(output: "${OPBEANS_APP}-docker.log", archiveOnlyOnFail: true){
+            filebeat(output: "${OPBEANS_APP}-docker.log", archiveOnlyOnFail: true){
               dir("${BASE_DIR}"){
                 sh(label: "Testing ${NAME} ${OPBEANS_APP}", script: ".ci/scripts/opbeans-app.sh ${NAME} ${APP} ${OPBEANS_APP}")
               }
@@ -126,7 +126,7 @@ pipeline {
               sh script: ".ci/bump-version.sh ${env.BUILD_OPTS.replaceAll('--rum-agent-branch ', '')} false", label: 'Bump version'
               sh script: 'make build', label: 'Build docker image with the new rum agent'
             }
-            fielbeat(output: "opbeans-rum-docker.log", archiveOnlyOnFail: true){
+            filebeat(output: "opbeans-rum-docker.log", archiveOnlyOnFail: true){
               dir("${BASE_DIR}"){
                 sh(label: 'Testing RUM', script: '.ci/scripts/opbeans-rum.sh')
               }
@@ -153,7 +153,7 @@ pipeline {
       steps {
         deleteDir()
         unstash "source"
-        fielbeat(output: "all-docker.log", archiveOnlyOnFail: true){
+        filebeat(output: "all-docker.log", archiveOnlyOnFail: true){
           dir("${BASE_DIR}"){
             sh ".ci/scripts/all.sh"
           }
@@ -204,7 +204,7 @@ pipeline {
       steps {
         deleteDir()
         unstash "source"
-        fielbeat(output: "opbeans-docker.log", archiveOnlyOnFail: true){
+        filebeat(output: "opbeans-docker.log", archiveOnlyOnFail: true){
           dir("${BASE_DIR}"){
             sh ".ci/scripts/opbeans.sh"
           }

From 39958e060e50abd6cfb81ed2013689f54d651a61 Mon Sep 17 00:00:00 2001
From: Ivan Fernandez Calvo <kuisathaverat@yahoo.com>
Date: Wed, 20 Jan 2021 19:28:59 +0100
Subject: [PATCH 6/9] test: list containers

---
 .ci/integrationTestDownstream.groovy | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.ci/integrationTestDownstream.groovy b/.ci/integrationTestDownstream.groovy
index 5e715adff..c79656b08 100644
--- a/.ci/integrationTestDownstream.groovy
+++ b/.ci/integrationTestDownstream.groovy
@@ -215,9 +215,11 @@ def runScript(Map params = [:]){
   deleteDir()
   unstash "source"
   filebeat(output: "${dockerLogs}.log", archiveOnlyOnFail: true){
+    sh 'docker ps -a'
     dir("${BASE_DIR}"){
       withEnv(env){
         sh(label: "Testing ${agentType}", script: ".ci/scripts/${agentType}.sh")
+        sh 'docker ps -a'
       }
     }
   }

From f5540c7e86625f25cedf695c138a45e682188710 Mon Sep 17 00:00:00 2001
From: Ivan Fernandez Calvo <kuisathaverat@yahoo.com>
Date: Thu, 21 Jan 2021 19:23:35 +0100
Subject: [PATCH 7/9] fix: do not kill containers in CI

---
 .ci/scripts/common.sh | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.ci/scripts/common.sh b/.ci/scripts/common.sh
index 812ece78a..44a8e1e13 100644
--- a/.ci/scripts/common.sh
+++ b/.ci/scripts/common.sh
@@ -11,8 +11,9 @@ function runTests() {
     trap "stopEnv" EXIT
     targets="destroy-env"
   fi
-  targets="${targets} $@"
+  targets="${targets} $*"
   export VENV=${VENV:-${TMPDIR:-/tmp/}venv-$$}
+  # shellcheck disable=SC2086
   make ${targets}
 }
 
@@ -27,18 +28,12 @@ if [ -n "${APM_SERVER_BRANCH}" ]; then
  fi
 fi
 
-if [ -z "${DISABLE_BUILD_PARALLEL}" -o "${DISABLE_BUILD_PARALLEL}" = "false" ]; then
+if [ -z "${DISABLE_BUILD_PARALLEL}" ] || [ "${DISABLE_BUILD_PARALLEL}" = "false" ]; then
  BUILD_OPTS="${BUILD_OPTS} --build-parallel"
 fi
 
 ELASTIC_STACK_VERSION=${ELASTIC_STACK_VERSION:-'7.0.0'}
 
-# assume we're under CI if BUILD_NUMBER is set
-if [ -n "${BUILD_NUMBER}" ]; then
-  # kill any running containers under CI
-  [ -n "$(docker ps -aq)" ] && docker ps -aq | xargs -t docker rm -f || true
-fi
-
 echo "ELASTIC_STACK_VERSION=${ELASTIC_STACK_VERSION}"
 echo "APM_SERVER_BRANCH_VERSION=${APM_SERVER_BRANCH_VERSION}"
 echo "APM_SERVER_BRANCH_TYPE=${APM_SERVER_BRANCH_TYPE}"

From 9a84b2bbf24484e27252ac669b612e349bf26ae6 Mon Sep 17 00:00:00 2001
From: Ivan Fernandez Calvo <kuisathaverat@yahoo.com>
Date: Mon, 1 Feb 2021 13:24:02 +0100
Subject: [PATCH 8/9] fix: several fixes

---
 .ci/integrationTestDownstream.groovy |  7 ++-----
 .ci/integrationTestEC.groovy         |  2 +-
 .ci/integrationTestECK.groovy        |  2 +-
 .ci/integrationTestSelector.groovy   | 10 +++++-----
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.ci/integrationTestDownstream.groovy b/.ci/integrationTestDownstream.groovy
index ea93a28c1..85e36c388 100644
--- a/.ci/integrationTestDownstream.groovy
+++ b/.ci/integrationTestDownstream.groovy
@@ -117,7 +117,7 @@ pipeline {
         withGithubNotify(context: 'All', isBlueOcean: true) {
           deleteDir()
           unstash "source"
-          fielbeat(output: "${dockerLogs}.log", archiveOnlyOnFail: true){
+          filebeat(output: "docker-all.log", archiveOnlyOnFail: true){
             dir("${BASE_DIR}"){
               sh ".ci/scripts/all.sh"
             }
@@ -219,7 +219,7 @@ def runScript(Map params = [:]){
     log(level: 'INFO', text: "${label}")
     deleteDir()
     unstash "source"
-    filebeat(output: "${dockerLogs}.log", archiveOnlyOnFail: true){
+    filebeat(output: "docker-${dockerLogs}.log", archiveOnlyOnFail: true){
       sh 'docker ps -a'
       dir("${BASE_DIR}"){
         withEnv(env){
@@ -236,9 +236,6 @@ def wrappingup(label){
     def testResultsFolder = 'tests/results'
     def testResultsPattern = "${testResultsFolder}/*-junit*.xml"
     def labelFolder = normalise(label)
-    if(currentBuild.result == 'FAILURE' || currentBuild.result == 'UNSTABLE'){
-      dockerLogs(step: label, failNever: true)
-    }
     sh('make stop-env || echo 0')
     sh(label: 'Folder to aggregate test results from stages',
        script: "mkdir -p ${labelFolder}/${testResultsFolder} && cp -rf ${testResultsPattern} ${labelFolder}/${testResultsFolder}")
diff --git a/.ci/integrationTestEC.groovy b/.ci/integrationTestEC.groovy
index 21234a4ae..903b26731 100644
--- a/.ci/integrationTestEC.groovy
+++ b/.ci/integrationTestEC.groovy
@@ -199,7 +199,7 @@ def runTest(test){
   unstash 'source'
   withConfigEnv(){
     catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-      filebeat(output: "${dockerLogs}.log", archiveOnlyOnFail: true){
+      filebeat(output: "docker-${ELASTIC_STACK_VERSION}-${tesl}.log", archiveOnlyOnFail: true){
         dir("${BASE_DIR}"){
           sh ".ci/scripts/${test}.sh"
         }
diff --git a/.ci/integrationTestECK.groovy b/.ci/integrationTestECK.groovy
index d5b3bb665..8326dccb1 100644
--- a/.ci/integrationTestECK.groovy
+++ b/.ci/integrationTestECK.groovy
@@ -215,7 +215,7 @@ def runTest(test){
   unstash 'source'
   withConfigEnv(){
     catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-      filebeat(output: "${dockerLogs}.log", archiveOnlyOnFail: true){
+      filebeat(output: "docker-${ELASTIC_STACK_VERSION}-${tesl}.log", archiveOnlyOnFail: true){
         dir("${BASE_DIR}"){
           sh ".ci/scripts/${test}.sh"
         }
diff --git a/.ci/integrationTestSelector.groovy b/.ci/integrationTestSelector.groovy
index c3c27a572..e7e6fc317 100644
--- a/.ci/integrationTestSelector.groovy
+++ b/.ci/integrationTestSelector.groovy
@@ -76,7 +76,7 @@ pipeline {
           steps {
             deleteDir()
             unstash "source"
-            filebeat(output: "${NAME}-${APP}-docker.log", archiveOnlyOnFail: true){
+            filebeat(output: "docker-${NAME}-${APP}.log", archiveOnlyOnFail: true){
               dir("${BASE_DIR}"){
                 sh(label: "Testing ${NAME} ${APP}", script: ".ci/scripts/agent.sh ${NAME} ${APP}")
               }
@@ -99,7 +99,7 @@ pipeline {
           steps {
             deleteDir()
             unstash "source"
-            filebeat(output: "${OPBEANS_APP}-docker.log", archiveOnlyOnFail: true){
+            filebeat(output: "docker-${OPBEANS_APP}.log", archiveOnlyOnFail: true){
               dir("${BASE_DIR}"){
                 sh(label: "Testing ${NAME} ${OPBEANS_APP}", script: ".ci/scripts/opbeans-app.sh ${NAME} ${APP} ${OPBEANS_APP}")
               }
@@ -126,7 +126,7 @@ pipeline {
               sh script: ".ci/bump-version.sh ${env.BUILD_OPTS.replaceAll('--rum-agent-branch ', '')} false", label: 'Bump version'
               sh script: 'make build', label: 'Build docker image with the new rum agent'
             }
-            filebeat(output: "opbeans-rum-docker.log", archiveOnlyOnFail: true){
+            filebeat(output: "docker-opbeans-rum.log", archiveOnlyOnFail: true){
               dir("${BASE_DIR}"){
                 sh(label: 'Testing RUM', script: '.ci/scripts/opbeans-rum.sh')
               }
@@ -153,7 +153,7 @@ pipeline {
       steps {
         deleteDir()
         unstash "source"
-        filebeat(output: "all-docker.log", archiveOnlyOnFail: true){
+        filebeat(output: "docker-all.log", archiveOnlyOnFail: true){
           dir("${BASE_DIR}"){
             sh ".ci/scripts/all.sh"
           }
@@ -204,7 +204,7 @@ pipeline {
       steps {
         deleteDir()
         unstash "source"
-        filebeat(output: "opbeans-docker.log", archiveOnlyOnFail: true){
+        filebeat(output: "docker-opbeans.log", archiveOnlyOnFail: true){
           dir("${BASE_DIR}"){
             sh ".ci/scripts/opbeans.sh"
           }

From 091981e0f78bb1a990e37ec9cf3a14206d5e5869 Mon Sep 17 00:00:00 2001
From: Ivan Fernandez Calvo <kuisathaverat@yahoo.com>
Date: Tue, 2 Feb 2021 14:07:49 +0100
Subject: [PATCH 9/9] fix: typo

---
 .ci/integrationTestEC.groovy  | 2 +-
 .ci/integrationTestECK.groovy | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/integrationTestEC.groovy b/.ci/integrationTestEC.groovy
index 903b26731..a7f71c0fc 100644
--- a/.ci/integrationTestEC.groovy
+++ b/.ci/integrationTestEC.groovy
@@ -199,7 +199,7 @@ def runTest(test){
   unstash 'source'
   withConfigEnv(){
     catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-      filebeat(output: "docker-${ELASTIC_STACK_VERSION}-${tesl}.log", archiveOnlyOnFail: true){
+      filebeat(output: "docker-${ELASTIC_STACK_VERSION}-${test}.log", archiveOnlyOnFail: true){
         dir("${BASE_DIR}"){
           sh ".ci/scripts/${test}.sh"
         }
diff --git a/.ci/integrationTestECK.groovy b/.ci/integrationTestECK.groovy
index 8326dccb1..e0cafe7aa 100644
--- a/.ci/integrationTestECK.groovy
+++ b/.ci/integrationTestECK.groovy
@@ -215,7 +215,7 @@ def runTest(test){
   unstash 'source'
   withConfigEnv(){
     catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
-      filebeat(output: "docker-${ELASTIC_STACK_VERSION}-${tesl}.log", archiveOnlyOnFail: true){
+      filebeat(output: "docker-${ELASTIC_STACK_VERSION}-${test}.log", archiveOnlyOnFail: true){
         dir("${BASE_DIR}"){
           sh ".ci/scripts/${test}.sh"
         }