Skip to content

Commit

Permalink
chore: pass BEAT_VERSION when running E2E tests (backport elastic#26291
Browse files Browse the repository at this point in the history
…) (elastic#26889)

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

(cherry picked from commit b35a1bf)

* fix: proper param type

Co-authored-by: Jaime Soriano Pastor <[email protected]>

Co-authored-by: Manuel de la Peña <[email protected]>
Co-authored-by: Jaime Soriano Pastor <[email protected]>
  • Loading branch information
3 people authored Sep 22, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent bc334a8 commit edb223f
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .ci/packaging.groovy
Original file line number Diff line number Diff line change
@@ -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),
1 change: 1 addition & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -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){

0 comments on commit edb223f

Please sign in to comment.