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

Jump to bottom

Rename iso -> anaconda-iso #165

Merged
merged 1 commit into from
Feb 15, 2024
Merged

Rename iso -> anaconda-iso #165

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ The following image types are currently available via the `--type` argument:
|-----------------------|---------------------------------------------------------------------------------------|
| `ami` | [Amazon Machine Image](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AMIs.html) |
| `qcow2` **(default)** | [QEMU](https://www.qemu.org/) |
| `iso` | An unattended Anaconda installer that installs to the first disk found. |
| `anaconda-iso` | An unattended Anaconda installer that installs to the first disk found. |

## ☁️ Cloud uploaders

Expand Down
2 changes: 1 addition & 1 deletion bib/cmd/bootc-image-builder/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func Manifest(c *ManifestConfig) (*manifest.Manifest, error) {
switch c.ImgType {
case "ami", "qcow2", "raw":
return manifestForDiskImage(c, rng)
case "iso":
case "anaconda-iso", "iso":
return manifestForISO(c, rng)
default:
return nil, fmt.Errorf("Manifest(): unsupported image type %q", c.ImgType)
Expand Down
4 changes: 2 additions & 2 deletions bib/cmd/bootc-image-builder/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,10 @@ func cmdBuild(cmd *cobra.Command, args []string) error {
exports = []string{"qcow2"}
case "ami", "raw":
exports = []string{"image"}
case "iso":
case "anaconda-iso", "iso":
exports = []string{"bootiso"}
default:
return fmt.Errorf("valid types are 'qcow2', 'ami', 'raw', 'iso', not: '%s'", imgType)
return fmt.Errorf("valid types are 'qcow2', 'ami', 'raw', 'anaconda-iso', not: '%s'", imgType)
}

manifestPath := filepath.Join(outputDir, manifest_fname)
Expand Down
4 changes: 2 additions & 2 deletions test/test_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def image_type_fixture(shared_tmpdir, build_container, request, force_aws_upload
"qcow2": pathlib.Path(output_path) / "qcow2/disk.qcow2",
"ami": pathlib.Path(output_path) / "image/disk.raw",
"raw": pathlib.Path(output_path) / "image/disk.raw",
"iso": pathlib.Path(output_path) / "bootiso/install.iso",
"anaconda-iso": pathlib.Path(output_path) / "bootiso/install.iso",
}
assert len(artifact) == len(set(t.split(",")[1] for t in gen_testcases("all"))), \
"please keep artifact mapping and supported images in sync"
Expand Down Expand Up @@ -248,7 +248,7 @@ def test_image_build_without_se_linux_denials(image_type):


@pytest.mark.skipif(platform.system() != "Linux", reason="boot test only runs on linux right now")
@pytest.mark.parametrize("image_type", gen_testcases("iso"), indirect=["image_type"])
@pytest.mark.parametrize("image_type", gen_testcases("anaconda-iso"), indirect=["image_type"])
def test_iso_installs(image_type):
installer_iso_path = image_type.img_path
test_disk_path = installer_iso_path.with_name("test-disk.img")
Expand Down
4 changes: 2 additions & 2 deletions test/testcases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def gen_testcases(what):
# supported images that can be directly booted
DIRECT_BOOT_IMAGE_TYPES = ("qcow2", "ami", "raw")
# supported images that require an install
INSTALLER_IMAGE_TYPES = ("iso",)
INSTALLER_IMAGE_TYPES = ("anaconda-iso",)

# bootc containers that are tested by default
CONTAINERS_TO_TEST = {
Expand All @@ -26,7 +26,7 @@ def gen_testcases(what):
return CONTAINERS_TO_TEST.values()
elif what == "ami-boot":
return [cnt + ",ami" for cnt in CONTAINERS_TO_TEST.values()]
elif what == "iso":
elif what == "anaconda-iso":
test_cases = []
# only fedora right now, centos iso installer is broken right now:
# https://github.com/osbuild/bootc-image-builder/issues/157
Expand Down
Loading