Skip to content

Commit 0d49e67

Browse files
jlebondustymabe
authored andcommitted
cmd-generate-release-meta: propagate FCOS stream name from label
We need the stream name there. It was previously getting that from the git branch name, but we don't populate that anymore in the buildah path, only the git URL and commit. But we do have the more explicit stream name as a label anyway, so let's use that.
1 parent ca2029d commit 0d49e67

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/cmd-generate-release-meta

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,12 @@ def append_build(out, input_):
122122
if args.stream_name:
123123
streamnamesrc = {'branch': args.stream_name}
124124
else:
125-
streamnamesrc = input_.get('coreos-assembler.container-config-git')
125+
fcos_stream = input_.get('coreos-assembler.oci-imported-labels', {}).get('fedora-coreos.stream')
126+
if fcos_stream:
127+
streamnamesrc = {'branch': fcos_stream}
128+
else:
129+
streamnamesrc = input_.get('coreos-assembler.container-config-git')
130+
126131
ensure_dup(streamnamesrc, out, 'branch', 'stream')
127132

128133
def artifact(i):

0 commit comments

Comments
 (0)