jobs/build: add support for variant value in cosa init

coreos · Dec 13, 2022 · 12dd90a · 12dd90a
1 parent a7d2009
commit 12dd90a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/docs/config.yaml b/docs/config.yaml
@@ -58,6 +58,8 @@ streams:
       source_config_ref: main
       # OPTIONAL: implement the yumrepos branch workaround for this stream
       yumrepos_branch_rhcos_hack: true
+      # OPTIONAL: override OS variant to use for this stream
+      variant: rhcos-9.0
     stable:
       type: production
       # OPTIONAL: override cosa image to use for this stream

diff --git 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
@@ -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}
                 """)
             }