From 7055706a8811097459cf1a23d27b27397335d4f3 Mon Sep 17 00:00:00 2001 From: Michael Armijo Date: Mon, 12 Dec 2022 15:21:48 -0500 Subject: [PATCH] jobs/build: add support for variant value in cosa init --- jobs/build-arch.Jenkinsfile | 3 ++- jobs/build.Jenkinsfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jobs/build-arch.Jenkinsfile b/jobs/build-arch.Jenkinsfile index 7ee59e1df..e8cc63a05 100644 --- a/jobs/build-arch.Jenkinsfile +++ b/jobs/build-arch.Jenkinsfile @@ -172,8 +172,9 @@ lock(resource: "build-${params.STREAM}-${basearch}") { """) } else { def yumrepos = pipecfg.source_config.yumrepos ? "--yumrepos ${pipecfg.source_config.yumrepos}" : "" + def variant = stream_info.variant ? "--variant ${stream_info.variant}" : "" shwrap(""" - cosa init --force --branch ${ref} --commit=${src_config_commit} ${yumrepos} ${pipecfg.source_config.url} + cosa init --force --branch ${ref} --commit=${src_config_commit} ${yumrepos} ${variant} ${pipecfg.source_config.url} """) } diff --git a/jobs/build.Jenkinsfile b/jobs/build.Jenkinsfile index ab911e3af..10edd5a49 100644 --- a/jobs/build.Jenkinsfile +++ b/jobs/build.Jenkinsfile @@ -156,8 +156,9 @@ lock(resource: "build-${params.STREAM}") { """) } else { def yumrepos = pipecfg.source_config.yumrepos ? "--yumrepos ${pipecfg.source_config.yumrepos}" : "" + def variant = stream_info.variant ? "--variant ${stream_info.variant}" : "" shwrap(""" - cosa init --force --branch ${ref} --commit=${src_config_commit} ${yumrepos} ${pipecfg.source_config.url} + cosa init --force --branch ${ref} --commit=${src_config_commit} ${yumrepos} ${variant} ${pipecfg.source_config.url} """) }