Fix the compose arguments for the Fedora version of Anaconda
This adds make_oci, and moves qcow2 to the more generic image_type (which just uses qemu-img disk names).
This commit is contained in:
parent
b6e0ba2e45
commit
b67c821706
@ -217,9 +217,8 @@ def start_build(cfg, dnflock, gitlock, branch, recipe_name, compose_type, test_m
|
|||||||
"compression": "xz",
|
"compression": "xz",
|
||||||
"compress_args": [],
|
"compress_args": [],
|
||||||
"ks": [ks_path],
|
"ks": [ks_path],
|
||||||
"project": "Red Hat Enterprise Linux",
|
"logfile": log_dir,
|
||||||
"releasever": "7",
|
"timeout": 60, # 60 minute timeout
|
||||||
"logfile": log_dir
|
|
||||||
})
|
})
|
||||||
with open(joinpaths(results_dir, "config.toml"), "w") as f:
|
with open(joinpaths(results_dir, "config.toml"), "w") as f:
|
||||||
f.write(toml.dumps(cfg_args))
|
f.write(toml.dumps(cfg_args))
|
||||||
@ -262,11 +261,12 @@ def compose_args(compose_type):
|
|||||||
"make_tar": True,
|
"make_tar": True,
|
||||||
"make_pxe_live": False,
|
"make_pxe_live": False,
|
||||||
"make_ostree_live": False,
|
"make_ostree_live": False,
|
||||||
|
"make_oci": False,
|
||||||
"ostree": False,
|
"ostree": False,
|
||||||
"live_rootfs_keep_size": False,
|
"live_rootfs_keep_size": False,
|
||||||
"live_rootfs_size": 0,
|
"live_rootfs_size": 0,
|
||||||
"qcow2": False,
|
"image_type": False, # False instead of None because of TOML
|
||||||
"qcow2_args": [],
|
"qemu_args": [],
|
||||||
"image_name": default_image_name("xz", "root.tar"),
|
"image_name": default_image_name("xz", "root.tar"),
|
||||||
"image_only": True,
|
"image_only": True,
|
||||||
"app_name": None,
|
"app_name": None,
|
||||||
@ -281,11 +281,12 @@ def compose_args(compose_type):
|
|||||||
"make_tar": False,
|
"make_tar": False,
|
||||||
"make_pxe_live": False,
|
"make_pxe_live": False,
|
||||||
"make_ostree_live": False,
|
"make_ostree_live": False,
|
||||||
|
"make_oci": False,
|
||||||
"ostree": False,
|
"ostree": False,
|
||||||
"live_rootfs_keep_size": False,
|
"live_rootfs_keep_size": False,
|
||||||
"live_rootfs_size": 0,
|
"live_rootfs_size": 0,
|
||||||
"qcow2": False,
|
"image_type": False, # False instead of None because of TOML
|
||||||
"qcow2_args": [],
|
"qemu_args": [],
|
||||||
"image_name": "live.iso",
|
"image_name": "live.iso",
|
||||||
"fs_label": "Anaconda", # Live booting may expect this to be 'Anaconda'
|
"fs_label": "Anaconda", # Live booting may expect this to be 'Anaconda'
|
||||||
"image_only": False,
|
"image_only": False,
|
||||||
@ -301,11 +302,12 @@ def compose_args(compose_type):
|
|||||||
"make_tar": False,
|
"make_tar": False,
|
||||||
"make_pxe_live": False,
|
"make_pxe_live": False,
|
||||||
"make_ostree_live": False,
|
"make_ostree_live": False,
|
||||||
|
"make_oci": False,
|
||||||
"ostree": False,
|
"ostree": False,
|
||||||
"live_rootfs_keep_size": False,
|
"live_rootfs_keep_size": False,
|
||||||
"live_rootfs_size": 0,
|
"live_rootfs_size": 0,
|
||||||
"qcow2": False,
|
"image_type": False, # False instead of None because of TOML
|
||||||
"qcow2_args": [],
|
"qemu_args": [],
|
||||||
"image_name": "disk.img",
|
"image_name": "disk.img",
|
||||||
"fs_label": "",
|
"fs_label": "",
|
||||||
"image_only": True,
|
"image_only": True,
|
||||||
@ -321,11 +323,12 @@ def compose_args(compose_type):
|
|||||||
"make_tar": False,
|
"make_tar": False,
|
||||||
"make_pxe_live": False,
|
"make_pxe_live": False,
|
||||||
"make_ostree_live": False,
|
"make_ostree_live": False,
|
||||||
|
"make_oci": False,
|
||||||
"ostree": False,
|
"ostree": False,
|
||||||
"live_rootfs_keep_size": False,
|
"live_rootfs_keep_size": False,
|
||||||
"live_rootfs_size": 0,
|
"live_rootfs_size": 0,
|
||||||
"qcow2": True,
|
"image_type": "qcow2",
|
||||||
"qcow2_args": [],
|
"qemu_args": [],
|
||||||
"image_name": "disk.qcow2",
|
"image_name": "disk.qcow2",
|
||||||
"fs_label": "",
|
"fs_label": "",
|
||||||
"image_only": True,
|
"image_only": True,
|
||||||
@ -341,11 +344,12 @@ def compose_args(compose_type):
|
|||||||
"make_tar": False,
|
"make_tar": False,
|
||||||
"make_pxe_live": False,
|
"make_pxe_live": False,
|
||||||
"make_ostree_live": False,
|
"make_ostree_live": False,
|
||||||
|
"make_oci": False,
|
||||||
"ostree": False,
|
"ostree": False,
|
||||||
"live_rootfs_keep_size": False,
|
"live_rootfs_keep_size": False,
|
||||||
"live_rootfs_size": 0,
|
"live_rootfs_size": 0,
|
||||||
"qcow2": False,
|
"image_type": False, # False instead of None because of TOML
|
||||||
"qcow2_args": [],
|
"qemu_args": [],
|
||||||
"image_name": "filesystem.img",
|
"image_name": "filesystem.img",
|
||||||
"fs_label": "",
|
"fs_label": "",
|
||||||
"image_only": True,
|
"image_only": True,
|
||||||
|
Loading…
Reference in New Issue
Block a user