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

Update to use dl.fedoraproject.org and associated URLs #90

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update to use dl.fedoraproject.org and associated URLs #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be06919
Update to use dl.fedoraproject.org and associated URLs
nullr0ute Apr 30, 2020
110a669
Update EFI files to use dl.fedoraproject.org
nullr0ute Apr 30, 2020
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
6 changes: 3 additions & 3 deletions zezere/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ def run_django_management():


EFI_FILE_URL_BASE = (
"https://kojipkgs.fedoraproject.org/compose/iot/latest-Fedora-IoT-32/compose/IoT"
"https://dl.fedoraproject.org/pub/alt/iot/32/IoT/"
)


EFI_FILES = [
{
"url": EFI_FILE_URL_BASE + "/x86_64/os/isolinux/initrd.img",
"url": EFI_FILE_URL_BASE + "/x86_64/os/images/pxeboot/initrd.img",
"destination": "netboot/x86_64/initrd",
},
{
"url": EFI_FILE_URL_BASE + "/x86_64/os/isolinux/vmlinuz",
"url": EFI_FILE_URL_BASE + "/x86_64/os/images/pxeboot/vmlinuz",
"destination": "netboot/x86_64/vmlinuz",
},
{
Expand Down
16 changes: 8 additions & 8 deletions zezere/runreqs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,34 @@
from . import models


KOJI_ROOT = "https://kojipkgs.fedoraproject.org/compose"
COMPOSE_ROOT = "https://dl.fedoraproject.org/pub/alt/iot"

AUTO_RUNREQS = {
"fedora-iot-stable": {
"type": "ok",
"next": "fedora-installed",
"compose_root": f"{KOJI_ROOT}/iot/latest-Fedora-IoT-32",
"compose_root": f"{COMPOSE_ROOT}/32",
"compose_name": "IoT",
"clear_parts": True,
"install_type": "ostree",
"ostree": {
"osname": "fedora-iot-stable",
"remote": "fedora-iot",
"repo": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"repo": "https://ostree.fedoraproject.org/iot/",
"ref": "fedora/stable/:arch:/iot",
},
},
"fedora-iot-rawhide": {
"type": "ok",
"next": "fedora-installed",
"compose_root": f"{KOJI_ROOT}/iot/latest-Fedora-IoT-33",
"compose_root": f"{COMPOSE_ROOT}/rawhide",
"compose_name": "IoT",
"clear_parts": True,
"install_type": "ostree",
"ostree": {
"osname": "fedora-iot-rawhide",
"remote": "fedora-iot",
"repo": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"repo": "https://ostree.fedoraproject.org/iot/",
"ref": "fedora/rawhide/:arch:/iot",
},
},
Expand All @@ -54,8 +54,8 @@ def generate_auto_runreq(sender, instance, **kwargs):
instance.type = info["type"]

if "compose_root" in info:
compose_url = f"{info['compose_root']}/compose/{info['compose_name']}/:arch:/os"
instance.kernel_url = f"{compose_url}/isolinux/vmlinuz"
compose_url = f"{info['compose_root']}/{info['compose_name']}/:arch:/os"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is still useful though, since it decides where the stage2 (anaconda) gets pulled from.

instance.kernel_url = f"{compose_url}/images/pxeboot/vmlinuz"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The vmlinuz and initrd here aren't actually used, https://github.com/fedora-iot/zezere/blob/master/zezere/__init__.py#L17 means we download the current f32 initrd/vmlinuz for supported arches and those get used for all trees.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, so we effectively cache them local to zezere?

instance.kernel_cmd = " ".join(
[
f"inst.repo={compose_url}",
Expand All @@ -67,7 +67,7 @@ def generate_auto_runreq(sender, instance, **kwargs):
"ip=dhcp",
]
)
instance.initrd_url = f"{compose_url}/isolinux/initrd.img"
instance.initrd_url = f"{compose_url}/images/pxeboot/initrd.img"

settings = {"clear_parts": info.get("clear_parts"), "raw": info}

Expand Down