From 3e3d3a2be6aa4c9be6b4772b2d3958ed9c8725c5 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 22 Sep 2021 10:59:06 +0200
Subject: [PATCH] chore: pass BEAT_VERSION when running E2E tests (backport
 #26291) (#26889)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: pass BEAT_VERSION when running E2E tests (#26291)

(cherry picked from commit ea84a3b215795aaad846468cd2a7d4fec92f8c97)

* fix: proper param type

Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>

Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
---
 .ci/packaging.groovy | 2 ++
 Jenkinsfile          | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.ci/packaging.groovy b/.ci/packaging.groovy
index 5225246ef08..824686e59b7 100644
--- a/.ci/packaging.groovy
+++ b/.ci/packaging.groovy
@@ -429,11 +429,13 @@ def triggerE2ETests(String suite) {
 
   def branchName = isPR() ? "${env.CHANGE_TARGET}" : "${env.JOB_BASE_NAME}.x"
   def e2eTestsPipeline = "e2e-tests/e2e-testing-mbp/${branchName}"
+  def beatVersion = "${env.BEAT_VERSION}-SNAPSHOT"
 
   def parameters = [
     booleanParam(name: 'forceSkipGitChecks', value: true),
     booleanParam(name: 'forceSkipPresubmit', value: true),
     booleanParam(name: 'notifyOnGreenBuilds', value: !isPR()),
+    string(name: 'BEAT_VERSION', value: beatVersion),
     booleanParam(name: 'BEATS_USE_CI_SNAPSHOTS', value: true),
     string(name: 'runTestsSuites', value: suite),
     string(name: 'GITHUB_CHECK_NAME', value: env.GITHUB_CHECK_E2E_TESTS_NAME),
diff --git a/Jenkinsfile b/Jenkinsfile
index 0401750c9d2..9425b1e967f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -521,6 +521,7 @@ def e2e(Map args = [:]) {
     def goVersionForE2E = readFile('.go-version').trim()
     withEnv(["GO_VERSION=${goVersionForE2E}",
               "BEATS_LOCAL_PATH=${env.WORKSPACE}/${env.BASE_DIR}",
+              "BEAT_VERSION=${env.VERSION}-SNAPSHOT",
               "LOG_LEVEL=TRACE"]) {
       def status = 0
       filebeat(output: dockerLogFile){