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

buildextend-live: add osmet-pack-with-cosa-coreinst image.yaml key #1764

Merged
merged 1 commit into from
Oct 5, 2020
Merged

buildextend-live: add osmet-pack-with-cosa-coreinst image.yaml key #1764

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
13 changes: 11 additions & 2 deletions src/cmd-buildextend-live
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ print(f"Targeting build: {args.build}")
with open('src/config/image.yaml') as fh:
image_yaml = yaml.safe_load(fh)
squashfs_compression = 'lz4' if args.fast else image_yaml.get('squashfs-compression', 'zstd')
# This is a short-term hack to work around building f33 FCOS on f32 cosa
# https://github.com/coreos/coreos-assembler/issues/1761
# Note that the osmet file has some basic versioning and we also have testiso
# validating its output.
osmet_pack_with_cosa_coreinst = image_yaml.get('osmet-pack-with-cosa-coreinst', False)
jlebon marked this conversation as resolved.
Show resolved Hide resolved

srcdir_prefix = f"src/config/live/"

Expand Down Expand Up @@ -272,11 +277,15 @@ def generate_iso():
print(f'Generating osmet file for 512b metal image')
run_verbose(['/usr/lib/coreos-assembler/osmet-pack',
img_metal, '512', tmp_osmet, img_metal_checksum,
'fast' if args.fast else 'normal'])
'fast' if args.fast else 'normal',
'/usr/bin/coreos-installer' if osmet_pack_with_cosa_coreinst
else ''])
print(f'Generating osmet file for 4k metal image')
run_verbose(['/usr/lib/coreos-assembler/osmet-pack',
img_metal4k, '4096', tmp_osmet4k, img_metal4k_checksum,
'fast' if args.fast else 'normal'])
'fast' if args.fast else 'normal',
'/usr/bin/coreos-installer' if osmet_pack_with_cosa_coreinst
else ''])

# Generate root squashfs
print(f'Compressing squashfs with {squashfs_compression}')
Expand Down