From fdbdb52a7b069f22c203191e5bfb4cc6b1d7efc4 Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Wed, 10 Jan 2018 12:06:06 -0500 Subject: [PATCH] jjb: lava: change job parameters to uppercase Signed-off-by: Francis Deslauriers --- jobs/system-tests.yaml | 16 ++++++++-------- scripts/system-tests/system-trigger.groovy | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml index 2f8271b..1dedd47 100644 --- a/jobs/system-tests.yaml +++ b/jobs/system-tests.yaml @@ -4,35 +4,35 @@ name: 'system_tests_parameters_defaults' parameters: - string: - name: 'tools_commit_id' + name: 'LTTNG_TOOLS_COMMIT_ID' default: '' description: 'The lttng-tools commit id to build.' - string: - name: 'modules_commit_id' + name: 'LTTNG_MODULES_COMMIT_ID' default: '' description: 'The lttng-modules commit id to build.' - string: - name: 'ust_commit_id' + name: 'LTTNG_UST_COMMIT_ID' default: '' description: 'The lttng-ust commit id to build.' - string: - name: 'kernel_tag_id' + name: 'KERNEL_TAG_ID' default: '' description: 'The linux kernel git tag to build against.' - string: - name: 'kernel_repo' + name: 'KERNEL_REPO' default: 'git://git-mirror.internal.efficios.com/kernel/stable/linux-stable.git' description: 'Linux kernel git repo to checkout the kernel id' - string: - name: 'tools_repo' + name: 'LTTNG_TOOLS_REPO' default: 'https://github.com/lttng/lttng-tools.git' description: 'LTTng-Tools git repo to checkout the tools id' - string: - name: 'modules_repo' + name: 'LTTNG_MODULES_REPO' default: 'https://github.com/lttng/lttng-modules.git' description: 'LTTng-Modules git repo to checkout the Modules id' - string: - name: 'ust_repo' + name: 'LTTNG_UST_REPO' default: 'https://github.com/lttng/lttng-ust.git' description: 'LTTng-UST git repo to checkout the UST id' diff --git a/scripts/system-tests/system-trigger.groovy b/scripts/system-tests/system-trigger.groovy index 08a0f14..c1b14b9 100644 --- a/scripts/system-tests/system-trigger.groovy +++ b/scripts/system-tests/system-trigger.groovy @@ -293,10 +293,10 @@ def LaunchJob = { jobName, runConfig -> params += paramdef.getDefaultParameterValue(); } - params.add(new StringParameterValue('tools_commit_id', runConfig.lttngToolsCommitId)) - params.add(new StringParameterValue('modules_commit_id', runConfig.lttngModulesCommitId)) - params.add(new StringParameterValue('ust_commit_id', runConfig.lttngUstCommitId)) - params.add(new StringParameterValue('kernel_tag_id', runConfig.linuxTagId)) + params.add(new StringParameterValue('LTTNG_TOOLS_COMMIT_ID', runConfig.lttngToolsCommitId)) + params.add(new StringParameterValue('LTTNG_MODULES_COMMIT_ID', runConfig.lttngModulesCommitId)) + params.add(new StringParameterValue('LTTNG_UST_COMMIT_ID', runConfig.lttngUstCommitId)) + params.add(new StringParameterValue('KERNEL_TAG_ID', runConfig.linuxTagId)) def currBuild = job.scheduleBuild2(0, new Cause.UpstreamCause(build), new ParametersAction(params)) if (currBuild != null ) { -- 2.34.1