diff --git a/Schutzfile b/Schutzfile index f02195e0f1..0c43e5f400 100644 --- a/Schutzfile +++ b/Schutzfile @@ -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" } } }, @@ -82,4 +83,4 @@ } } } -} \ No newline at end of file +} diff --git a/data/distrodefs/fedora/imagetypes.yaml b/data/distrodefs/fedora/imagetypes.yaml index e1b9ce3c82..0f29c282ff 100644 --- a/data/distrodefs/fedora/imagetypes.yaml +++ b/data/distrodefs/fedora/imagetypes.yaml @@ -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 + cloud_init_services: &cloud_init_services - "cloud-init.service" - "cloud-config.service" @@ -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" @@ -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 @@ -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" diff --git a/pkg/distro/generic/fedora_test.go b/pkg/distro/generic/fedora_test.go index 7d3042d58b..19aa8a4c59 100644 --- a/pkg/distro/generic/fedora_test.go +++ b/pkg/distro/generic/fedora_test.go @@ -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", }, }, @@ -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", }, }, diff --git a/test/config-list.json b/test/config-list.json index e954a60bf4..5a79b8f6ab 100644 --- a/test/config-list.json +++ b/test/config-list.json @@ -260,6 +260,7 @@ "iot-bootable-container", "iot-container", "everything-network-installer", + "server-network-installer", "pxe-tar-xz" ] } diff --git a/test/data/manifest-checksums/fedora_42-aarch64-server_network_installer-empty b/test/data/manifest-checksums/fedora_42-aarch64-server_network_installer-empty new file mode 100644 index 0000000000..bb3268452e --- /dev/null +++ b/test/data/manifest-checksums/fedora_42-aarch64-server_network_installer-empty @@ -0,0 +1 @@ +bbd7f29af22c5e420a3521ce7c2e1c4180c17a5a diff --git a/test/data/manifest-checksums/fedora_42-x86_64-server_network_installer-empty b/test/data/manifest-checksums/fedora_42-x86_64-server_network_installer-empty new file mode 100644 index 0000000000..80b373e16d --- /dev/null +++ b/test/data/manifest-checksums/fedora_42-x86_64-server_network_installer-empty @@ -0,0 +1 @@ +9a86c951df9cb46a4defd702468bbf8fda52c33a diff --git a/test/data/manifest-checksums/fedora_43-aarch64-server_network_installer-empty b/test/data/manifest-checksums/fedora_43-aarch64-server_network_installer-empty new file mode 100644 index 0000000000..13db3a9f21 --- /dev/null +++ b/test/data/manifest-checksums/fedora_43-aarch64-server_network_installer-empty @@ -0,0 +1 @@ +ac0174f4e14709604566533b295a0c1d879156d8 diff --git a/test/data/manifest-checksums/fedora_43-x86_64-server_network_installer-empty b/test/data/manifest-checksums/fedora_43-x86_64-server_network_installer-empty new file mode 100644 index 0000000000..524e4f9ec9 --- /dev/null +++ b/test/data/manifest-checksums/fedora_43-x86_64-server_network_installer-empty @@ -0,0 +1 @@ +8bf0ff4c6a824bd9029725cc0b54977bf28a2916 diff --git a/test/data/manifest-checksums/fedora_44-aarch64-server_network_installer-empty b/test/data/manifest-checksums/fedora_44-aarch64-server_network_installer-empty new file mode 100644 index 0000000000..acbac0cc1e --- /dev/null +++ b/test/data/manifest-checksums/fedora_44-aarch64-server_network_installer-empty @@ -0,0 +1 @@ +05af07005ad5f0dc6bc911b718c69662e7dbf335 diff --git a/test/data/manifest-checksums/fedora_44-x86_64-server_network_installer-empty b/test/data/manifest-checksums/fedora_44-x86_64-server_network_installer-empty new file mode 100644 index 0000000000..b7917b5a39 --- /dev/null +++ b/test/data/manifest-checksums/fedora_44-x86_64-server_network_installer-empty @@ -0,0 +1 @@ +a943879a6cbc3d6a2eb6f741ed0ff39e81d6a679 diff --git a/test/scripts/boot-image b/test/scripts/boot-image index 59e9946710..0336c63856 100755 --- a/test/scripts/boot-image +++ b/test/scripts/boot-image @@ -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"]: