Skip to content

fedora: add server-network-installer #2094

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

Merged
thozza merged 1 commit into from
Dec 16, 2025
Merged

fedora: add server-network-installer #2094

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
5 changes: 3 additions & 2 deletions Schutzfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"image-installer": "rhos-01/fedora-42",
"minimal-installer": "rhos-01/fedora-42",
"network-installer": "rhos-01/fedora-42",
"everything-network-installer": "rhos-01/fedora-42"
"everything-network-installer": "rhos-01/fedora-42",
"server-network-installer": "rhos-01/fedora-42"
}
}
},
Expand Down Expand Up @@ -82,4 +83,4 @@
}
}
}
}
}
192 changes: 102 additions & 90 deletions data/distrodefs/fedora/imagetypes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,97 @@
include:
- "dmidecode"

network_installer_pkgset: &network_installer_pkgset
include:
- anaconda
- anaconda-widgets
- anaconda-install-img-deps
- ostree
- rpm-ostree
- pigz
- audit
- bind-utils
- kernel
- kernel-modules
- kernel-modules-extra
- grubby
- glibc-all-langpacks
- plymouth
- anaconda-dracut
- dracut-network
- dracut-config-generic
- initscripts
- cryptsetup
- rpcbind
- kbd
- kbd-misc
- tar
- xz
- curl
- bzip2
- rsyslog
- device-mapper-persistent-data
- xfsdump
- volume_key
- nss-tools
- selinux-policy-targeted
- audit
- ethtool
- openssh-server
- nfs-utils
- openssh-clients
- net-tools
- bridge-utils
- nmap-ncat
- prefixdevname
- pciutils
- usbutils
- ipmitool
- mt-st
- smartmontools
- hdparm
- rdma-core
- rng-tools
- nvme-cli
- default-fonts-core-sans
- default-fonts-other-sans
- google-noto-sans-cjk-fonts
- gdb-gdbserver
- libreport-plugin-bugzilla
- libreport-plugin-reportuploader
- fpaste
- python3-pyatspi
- nano
- nano-default-editor
- vim-minimal
- strace
- lsof
- dump
- less
- wget2-wget
- rsync
- bind-utils
- ftp
- mtr
- vconfig
- spice-vdagent
- gdisk
- hexedit
- sg3_utils
conditions:
"x86_64 specific anaconda pkgs":
when:
arch: "x86_64"
append:
include:
- dmidecode
"aarch64 specific anaconda pkgs":
when:
arch: "aarch64"
append:
include:
- dmidecode
Copy link
Contributor

@lzap lzap Dec 16, 2025

Choose a reason for hiding this comment

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

Both are the same.

Copy link
Member Author

@supakeen supakeen Dec 16, 2025

Choose a reason for hiding this comment

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

Yes, but we don't have and conditions I think and the above doesn't apply to s390x/ppc64le (though we don't have ISOs at all there, so I don't know).


cloud_init_services: &cloud_init_services
- "cloud-init.service"
- "cloud-config.service"
Expand Down Expand Up @@ -2279,7 +2370,7 @@ image_types:
- "customizations.installation_device"

# Based on lorax runtime-install.tmpl
"everything-network-installer":
"everything-network-installer": &everything_network_installer
name_aliases: ["netinst"]
filename: "netinst.iso"
mime_type: "application/x-iso9660-image"
Expand All @@ -2295,95 +2386,7 @@ image_types:
locale: "en_US.UTF-8"
package_sets:
installer:
- include:
- anaconda
- anaconda-widgets
- anaconda-install-img-deps
- ostree
- rpm-ostree
- pigz
- audit
- bind-utils
- kernel
- kernel-modules
- kernel-modules-extra
- grubby
- glibc-all-langpacks
- plymouth
- anaconda-dracut
- dracut-network
- dracut-config-generic
- initscripts
- cryptsetup
- rpcbind
- kbd
- kbd-misc
- tar
- xz
- curl
- bzip2
- rsyslog
- device-mapper-persistent-data
- xfsdump
- volume_key
- nss-tools
- selinux-policy-targeted
- audit
- ethtool
- openssh-server
- nfs-utils
- openssh-clients
- net-tools
- bridge-utils
- nmap-ncat
- prefixdevname
- pciutils
- usbutils
- ipmitool
- mt-st
- smartmontools
- hdparm
- rdma-core
- rng-tools
- nvme-cli
- default-fonts-core-sans
- default-fonts-other-sans
- google-noto-sans-cjk-fonts
- gdb-gdbserver
- libreport-plugin-bugzilla
- libreport-plugin-reportuploader
- fpaste
- python3-pyatspi
- nano
- nano-default-editor
- vim-minimal
- strace
- lsof
- dump
- less
- wget2-wget
- rsync
- bind-utils
- ftp
- mtr
- vconfig
- spice-vdagent
- gdisk
- hexedit
- sg3_utils
conditions:
"x86_64 specific anaconda pkgs":
when:
arch: "x86_64"
append:
include:
- dmidecode
"aarch64 specific anaconda pkgs":
when:
arch: "aarch64"
append:
include:
- dmidecode
- *network_installer_pkgset
platforms:
- *x86_64_installer_platform
- *aarch64_installer_platform
Expand All @@ -2405,6 +2408,15 @@ image_types:
- "customizations.locale"
- "customizations.user"

"server-network-installer":
<<: *everything_network_installer
name_aliases: []
package_sets:
installer:
- *network_installer_pkgset
- include:
- fedora-release-server

"pxe-tar-xz":
filename: "pxe.tar.xz"
compression: "xz"
Expand Down
2 changes: 2 additions & 0 deletions pkg/distro/generic/fedora_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ func TestFedoraArchitecture_ListImageTypes(t *testing.T) {
"iot-bootable-container",
"iot-simplified-installer",
"everything-network-installer",
"server-network-installer",
"pxe-tar-xz",
},
},
Expand Down Expand Up @@ -551,6 +552,7 @@ func TestFedoraArchitecture_ListImageTypes(t *testing.T) {
"iot-bootable-container",
"iot-simplified-installer",
"everything-network-installer",
"server-network-installer",
"pxe-tar-xz",
},
},
Expand Down
1 change: 1 addition & 0 deletions test/config-list.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@
"iot-bootable-container",
"iot-container",
"everything-network-installer",
"server-network-installer",
"pxe-tar-xz"
]
}
Expand Down
1 change: 1 addition & 0 deletions test/data/manifest-checksums/fedora_42-aarch64-server_network_installer-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bbd7f29af22c5e420a3521ce7c2e1c4180c17a5a
1 change: 1 addition & 0 deletions test/data/manifest-checksums/fedora_42-x86_64-server_network_installer-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9a86c951df9cb46a4defd702468bbf8fda52c33a
1 change: 1 addition & 0 deletions test/data/manifest-checksums/fedora_43-aarch64-server_network_installer-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ac0174f4e14709604566533b295a0c1d879156d8
1 change: 1 addition & 0 deletions test/data/manifest-checksums/fedora_43-x86_64-server_network_installer-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8bf0ff4c6a824bd9029725cc0b54977bf28a2916
1 change: 1 addition & 0 deletions test/data/manifest-checksums/fedora_44-aarch64-server_network_installer-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
05af07005ad5f0dc6bc911b718c69662e7dbf335
1 change: 1 addition & 0 deletions test/data/manifest-checksums/fedora_44-x86_64-server_network_installer-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a943879a6cbc3d6a2eb6f741ed0ff39e81d6a679
2 changes: 1 addition & 1 deletion test/scripts/boot-image
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def ensure_can_run_qemu_test(arch, image_path, config_file):
if customizations.get("fips") and info.get("distro").startswith("fedora"):
raise CannotRunQemuTest("fips on fedora is unstable, fails with e.g. dracut: FATAL: FIPS integrity test failed")
# network-installer has a bunch of extra constraints
if info.get("image-type") in ["network-installer", "everything-network-installer"]:
if info.get("image-type") in ["network-installer", "everything-network-installer", "server-network-installer"]:
# network install needs subscribed content but we cannot provide
# that currently
if info.get("distro") in ["rhel-10.1", "rhel-10.2"]:
Expand Down
Loading