From a48dca188597bfe6decc58be4f5a19378c61754b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Thu, 24 Jun 2021 14:35:19 +0200 Subject: [PATCH] fix: use the right param type (#26469) Jenkins, as expected, is honouring the param type used in the caller, but not honouring the type in the triggered pipeline. This issue has historical rationale, as the parameters are created dynamically (cherry picked from commit f429a82b978ced9893d7188650c2643a30c94798) # Conflicts: # .ci/packaging.groovy --- .ci/packaging.groovy | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.ci/packaging.groovy b/.ci/packaging.groovy index 5225246ef08..73f0e43034b 100644 --- a/.ci/packaging.groovy +++ b/.ci/packaging.groovy @@ -434,6 +434,10 @@ def triggerE2ETests(String suite) { booleanParam(name: 'forceSkipGitChecks', value: true), booleanParam(name: 'forceSkipPresubmit', value: true), booleanParam(name: 'notifyOnGreenBuilds', value: !isPR()), +<<<<<<< HEAD +======= + string(name: 'BEAT_VERSION', value: beatVersion), +>>>>>>> f429a82b9 (fix: use the right param type (#26469)) 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),