From ad78b802255eefeb2854caa0eee32ae427930a3f Mon Sep 17 00:00:00 2001
From: Victor Martinez <victormartinezrubio@gmail.com>
Date: Fri, 30 Oct 2020 13:25:30 +0000
Subject: [PATCH] [packaging][beats-tester] use commit id binaries (#22027)

# Conflicts:
#	.ci/packaging.groovy
#	Jenkinsfile
---
 .ci/beats-tester.groovy   | 30 +++++++++++++++++++++---------
 .ci/jobs/beats-tester.yml |  4 ++--
 .ci/packaging.groovy      |  2 +-
 Jenkinsfile               |  6 ++++++
 Makefile                  |  5 +++++
 5 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/.ci/beats-tester.groovy b/.ci/beats-tester.groovy
index 91781a98d31..3650246e966 100644
--- a/.ci/beats-tester.groovy
+++ b/.ci/beats-tester.groovy
@@ -54,7 +54,6 @@ pipeline {
           options { skipDefaultCheckout() }
           when { branch 'master' }
           steps {
-            // TODO: to use the git commit that triggered the upstream build
             runBeatsTesterJob(version: "${env.VERSION}-SNAPSHOT")
           }
         }
@@ -62,7 +61,6 @@ pipeline {
           options { skipDefaultCheckout() }
           when { branch '*.x' }
           steps {
-            // TODO: to use the git commit that triggered the upstream build
             runBeatsTesterJob(version: "${env.VERSION}-SNAPSHOT")
           }
         }
@@ -79,7 +77,7 @@ pipeline {
           options { skipDefaultCheckout() }
           when {
             not {
-              allOf {
+              anyOf {
                 branch comparator: 'REGEXP', pattern: '(master|.*x)'
                 changeRequest()
               }
@@ -96,14 +94,28 @@ pipeline {
 }
 
 def runBeatsTesterJob(Map args = [:]) {
-  if (args.apm && args.beats) {
+  def apm = args.get('apm', '')
+  def beats = args.get('beats', '')
+  def version = args.version
+
+  if (isUpstreamTrigger()) {
+    copyArtifacts(filter: 'beats-tester.properties',
+                  flatten: true,
+                  projectName: "Beats/packaging/${env.JOB_BASE_NAME}",
+                  selector: upstream(fallbackToLastSuccessful: true))
+    def props = readProperties(file: 'beats-tester.properties')
+    apm = props.get('APM_URL_BASE', '')
+    beats = props.get('BEATS_URL_BASE', '')
+    version = props.get('VERSION', '8.0.0-SNAPSHOT')
+  }
+  if (apm?.trim() || beats?.trim()) {
     build(job: env.BEATS_TESTER_JOB, propagate: false, wait: false,
           parameters: [
-            string(name: 'APM_URL_BASE', value: args.apm),
-            string(name: 'BEATS_URL_BASE', value: args.beats),
-            string(name: 'VERSION', value: args.version)
+            string(name: 'APM_URL_BASE', value: apm),
+            string(name: 'BEATS_URL_BASE', value: beats),
+            string(name: 'VERSION', value: version)
           ])
   } else {
-    build(job: env.BEATS_TESTER_JOB, propagate: false, wait: false, parameters: [ string(name: 'VERSION', value: args.version) ])
+    build(job: env.BEATS_TESTER_JOB, propagate: false, wait: false, parameters: [ string(name: 'VERSION', value: version) ])
   }
-}
\ No newline at end of file
+}
diff --git a/.ci/jobs/beats-tester.yml b/.ci/jobs/beats-tester.yml
index 522abfa5e5c..ceb7a6955ad 100644
--- a/.ci/jobs/beats-tester.yml
+++ b/.ci/jobs/beats-tester.yml
@@ -1,8 +1,8 @@
 ---
 - job:
     name: Beats/beats-tester
-    display-name: Beats Tester
-    description: Run the beats-tester
+    display-name: Beats Tester orchestrator
+    description: Orchestrate the beats-tester when packaging finished successfully
     view: Beats
     disabled: false
     project-type: multibranch
diff --git a/.ci/packaging.groovy b/.ci/packaging.groovy
index 3d38d0d27a2..96714c7a4a8 100644
--- a/.ci/packaging.groovy
+++ b/.ci/packaging.groovy
@@ -237,7 +237,7 @@ def publishPackages(baseDir){
   uploadPackages("${bucketUri}/${beatsFolderName}", baseDir)
 
   // Copy those files to another location with the sha commit to test them
-  // aftewords.
+  // afterward.
   bucketUri = "gs://${JOB_GCS_BUCKET}/commits/${env.GIT_BASE_COMMIT}"
   uploadPackages("${bucketUri}/${beatsFolderName}", baseDir)
 }
diff --git a/Jenkinsfile b/Jenkinsfile
index 2263e516fde..8ef2f52d84a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -122,6 +122,12 @@ pipeline {
     }
   }
   post {
+    success {
+      writeFile(file: 'packaging.properties', text: """## To be consumed by the packaging pipeline
+COMMIT=${env.GIT_BASE_COMMIT}
+VERSION=${env.VERSION}-SNAPSHOT""")
+      archiveArtifacts artifacts: 'packaging.properties'
+    }
     always {
       deleteDir()
       unstashV2(name: 'source', bucket: "${JOB_GCS_BUCKET}", credentialsId: "${JOB_GCS_CREDENTIALS}")
diff --git a/Makefile b/Makefile
index d64bb07776b..dfeee5ac739 100644
--- a/Makefile
+++ b/Makefile
@@ -176,6 +176,11 @@ python-env:
 test-apm:
 	sh ./script/test_apm.sh
 
+## get-version : Get the libbeat version
+.PHONY: get-version
+get-version:
+	@mage dumpVariables | grep 'beat_version' | cut -d"=" -f 2 | tr -d " "
+
 ### Packaging targets ####
 
 ## snapshot : Builds a snapshot release.