Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmdlib: check for metadata key before rojig #3948

Merged
merged 1 commit into from
Nov 20, 2024
Merged

cmdlib: check for metadata key before rojig #3948

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/cmdlib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,11 @@ prepare_build() {
rpm-ostree compose tree --repo="${tmprepo}" --print-only "${manifest}" > "${flattened_manifest}"
export flattened_manifest

# Abuse the rojig/name as the name of the VM images
# Also grab rojig summary for image upload descriptions
name=$(jq -r '.rojig.name' < "${flattened_manifest}")
summary=$(jq -r '.rojig.summary' < "${flattened_manifest}")
# Use metadata.name as the name of the VM images
# Also grab metadata.summary for image upload descriptions
# XXX: delete the rojig fallbacks once we've moved over to metadata
name=$(jq -r '.metadata.name//.rojig.name' < "${flattened_manifest}")
summary=$(jq -r '.metadata.summary//.rojig.summary' < "${flattened_manifest}")
ref=$(jq -r '.ref//""' < "${flattened_manifest}")
export name ref summary
# And validate fields coreos-assembler requires, but not rpm-ostree
Expand Down
Loading