File tree Expand file tree Collapse file tree 2 files changed +8
-8
lines changed
Expand file tree Collapse file tree 2 files changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -148,6 +148,14 @@ done
148148
149149prepare_build
150150
151+ # Use metadata.name as the name of the VM images
152+ # Also grab metadata.summary for image upload descriptions
153+ # XXX: delete the rojig fallbacks once we've moved over to metadata
154+ name=$( jq -r ' .metadata.name//.rojig.name' < " ${flattened_manifest} " )
155+ summary=$( jq -r ' .metadata.summary//.rojig.summary' < " ${flattened_manifest} " )
156+ ref=$( jq -r ' .ref//""' < " ${flattened_manifest} " )
157+ export name ref summary
158+
151159ostree --version
152160rpm-ostree --version
153161
Original file line number Diff line number Diff line change @@ -281,14 +281,6 @@ prepare_build() {
281281 rpm-ostree compose tree --repo=" ${tmprepo} " --print-only " ${manifest} " > " ${flattened_manifest} "
282282 export flattened_manifest
283283
284- # Use metadata.name as the name of the VM images
285- # Also grab metadata.summary for image upload descriptions
286- # XXX: delete the rojig fallbacks once we've moved over to metadata
287- name=$( jq -r ' .metadata.name//.rojig.name' < " ${flattened_manifest} " )
288- summary=$( jq -r ' .metadata.summary//.rojig.summary' < " ${flattened_manifest} " )
289- ref=$( jq -r ' .ref//""' < " ${flattened_manifest} " )
290- export name ref summary
291-
292284 # This dir is no longer used
293285 rm builds/work -rf
294286
You can’t perform that action at this time.
0 commit comments