diff --git a/test/data/testrepos/baseos/repodata/08c8cf048b8955d096460ed44de417a97db93ca8e5ee4623390e8c585da34c59-primary.xml.gz b/test/data/testrepos/baseos/repodata/08c8cf048b8955d096460ed44de417a97db93ca8e5ee4623390e8c585da34c59-primary.xml.gz
new file mode 100644
index 00000000..424345c1
Binary files /dev/null and b/test/data/testrepos/baseos/repodata/08c8cf048b8955d096460ed44de417a97db93ca8e5ee4623390e8c585da34c59-primary.xml.gz differ
diff --git a/test/data/testrepos/baseos/repodata/0fd6cb69a8ad078b319cba9d0aac16661cef181d4b9177439f241002f131a916-filelists.xml.gz b/test/data/testrepos/baseos/repodata/0fd6cb69a8ad078b319cba9d0aac16661cef181d4b9177439f241002f131a916-filelists.xml.gz
new file mode 100644
index 00000000..19547a3a
Binary files /dev/null and b/test/data/testrepos/baseos/repodata/0fd6cb69a8ad078b319cba9d0aac16661cef181d4b9177439f241002f131a916-filelists.xml.gz differ
diff --git a/test/data/testrepos/baseos/repodata/130494033cb9bffa40828ebc814d016920d9ce5d60041467af283ffcf38adef0-primary.xml.gz b/test/data/testrepos/baseos/repodata/130494033cb9bffa40828ebc814d016920d9ce5d60041467af283ffcf38adef0-primary.xml.gz
deleted file mode 100644
index 6ce4bc6d..00000000
Binary files a/test/data/testrepos/baseos/repodata/130494033cb9bffa40828ebc814d016920d9ce5d60041467af283ffcf38adef0-primary.xml.gz and /dev/null differ
diff --git a/test/data/testrepos/baseos/repodata/2ac4e27794f840034a13bb60800aba194e89fcd2175c87f57cfbd649139feff3-comps-BaseOS.x86_64.xml.gz b/test/data/testrepos/baseos/repodata/2ac4e27794f840034a13bb60800aba194e89fcd2175c87f57cfbd649139feff3-comps-BaseOS.x86_64.xml.gz
deleted file mode 100644
index 6f3584fc..00000000
Binary files a/test/data/testrepos/baseos/repodata/2ac4e27794f840034a13bb60800aba194e89fcd2175c87f57cfbd649139feff3-comps-BaseOS.x86_64.xml.gz and /dev/null differ
diff --git a/test/data/testrepos/baseos/repodata/7b99933643e8bff43d3d82180e7d678fac89b6a1b9b8f5f88ea93a5c3b9b5dbd-filelists.xml.gz b/test/data/testrepos/baseos/repodata/7b99933643e8bff43d3d82180e7d678fac89b6a1b9b8f5f88ea93a5c3b9b5dbd-filelists.xml.gz
deleted file mode 100644
index 1dc928e2..00000000
Binary files a/test/data/testrepos/baseos/repodata/7b99933643e8bff43d3d82180e7d678fac89b6a1b9b8f5f88ea93a5c3b9b5dbd-filelists.xml.gz and /dev/null differ
diff --git a/test/data/testrepos/baseos/repodata/ee41540e54efdb992b0d2fe56f16df2d84c804295d414f65aae6d1d91a339ee3-comps-BaseOS.x86_64.xml b/test/data/testrepos/baseos/repodata/ee41540e54efdb992b0d2fe56f16df2d84c804295d414f65aae6d1d91a339ee3-comps-BaseOS.x86_64.xml
new file mode 100644
index 00000000..67db10bc
--- /dev/null
+++ b/test/data/testrepos/baseos/repodata/ee41540e54efdb992b0d2fe56f16df2d84c804295d414f65aae6d1d91a339ee3-comps-BaseOS.x86_64.xml
@@ -0,0 +1,872 @@
+
+
+
+
+ additional-devel
+ Additional Development
+ Additional development headers and libraries for building open-source applications.
+ true
+ false
+
+ hmaccalc
+ lz4
+ lzo
+
+
+
+ anaconda-tools
+ Anaconda tools
+
+ false
+ false
+
+ chrony
+ cryptsetup
+ device-mapper-multipath
+ dosfstools
+ dracut-network
+ e2fsprogs
+ efibootmgr
+ fcoe-utils
+ firewalld
+ glibc-all-langpacks
+ grub2-efi-x64
+ grub2-efi-x64-cdboot
+ grub2-pc
+ grub2-tools
+ grub2-tools-efi
+ grub2-tools-extra
+ iscsi-initiator-utils
+ lvm2
+ mdadm
+ realmd
+ restore
+ shim-x64
+ syslinux-extlinux
+ teamd
+ tmux
+ xfsprogs
+
+
+
+ base
+ Base
+ The standard installation of Red Hat Enterprise Linux.
+ true
+ false
+
+ acl
+ at
+ attr
+ bc
+ cpio
+ crontabs
+ cyrus-sasl-plain
+ dbus
+ ed
+ file
+ irqbalance
+ kpatch
+ kpatch-dnf
+ logrotate
+ lsof
+ mcelog
+ microcode_ctl
+ net-tools
+ pciutils
+ psacct
+ quota
+ redhat-release
+ redhat-release-eula
+ sudo
+ symlinks
+ systemd-udev
+ tar
+ tree
+ tuned
+ util-linux-user
+ bash-completion
+ bluez
+ bpftool
+ bzip2
+ chrony
+ cockpit
+ cryptsetup
+ dos2unix
+ dosfstools
+ ethtool
+ gnupg2
+ iprutils
+ kmod-kvdo
+ ledmon
+ lvm2
+ mailcap
+ man-pages
+ mdadm
+ mlocate
+ mtr
+ nano
+ nvme-cli
+ realmd
+ rsync
+ smartmontools
+ sos
+ sssd
+ strace
+ teamd
+ time
+ unzip
+ usbutils
+ vdo
+ virt-what
+ which
+ words
+ xfsdump
+ zip
+ cifs-utils
+ cockpit-doc
+ fwupd
+ ima-evm-utils
+ nfs-utils
+ nvmetcli
+ traceroute
+ vdo-support
+ zsh
+
+
+
+ conflicts-baseos
+ Conflicts BaseOS
+ This group includes packages conflicting with an everything installation from the BaseOS repo
+ false
+ false
+
+ coreutils-single
+ libcurl-minimal
+
+
+
+ core
+ Core
+ Minimal host installation
+ true
+ false
+
+ audit
+ basesystem
+ bash
+ coreutils
+ cronie
+ crypto-policies
+ crypto-policies-scripts
+ curl
+ dnf
+ e2fsprogs
+ filesystem
+ firewalld
+ glibc
+ grubby
+ hostname
+ iproute
+ iproute-tc
+ iputils
+ irqbalance
+ kbd
+ kexec-tools
+ less
+ logrotate
+ man-db
+ ncurses
+ openssh-clients
+ openssh-server
+ p11-kit
+ parted
+ passwd
+ policycoreutils
+ procps-ng
+ rootfiles
+ rpm
+ rpm-plugin-audit
+ selinux-policy-targeted
+ setup
+ shadow-utils
+ sssd-common
+ sssd-kcm
+ sudo
+ systemd
+ util-linux
+ vim-minimal
+ xfsprogs
+ yum
+ NetworkManager
+ NetworkManager-team
+ NetworkManager-tui
+ authselect
+ dnf-plugins-core
+ dracut-config-rescue
+ initscripts-rename-device
+ iwl100-firmware
+ iwl1000-firmware
+ iwl105-firmware
+ iwl135-firmware
+ iwl2000-firmware
+ iwl2030-firmware
+ iwl3160-firmware
+ iwl5000-firmware
+ iwl5150-firmware
+ iwl6000g2a-firmware
+ iwl6050-firmware
+ iwl7260-firmware
+ kernel-tools
+ libsysfs
+ linux-firmware
+ lshw
+ lsscsi
+ microcode_ctl
+ prefixdevname
+ sg3_utils
+ sg3_utils-libs
+ dracut-config-generic
+ dracut-network
+ rdma-core
+ selinux-policy-mls
+ tboot
+
+
+
+ development
+ Development Tools
+ A basic development environment.
+ true
+ true
+
+ binutils
+ make
+ pkgconf
+ pkgconf-m4
+ pkgconf-pkg-config
+ rpm-sign
+ strace
+
+
+
+ dial-up
+ Dial-up Networking Support
+
+ true
+ false
+
+ ppp
+ ModemManager
+ NetworkManager-adsl
+ lrzsz
+ minicom
+
+
+
+ file-server
+ File and Storage Server
+ CIFS, SMB, NFS, iSCSI, iSER, and iSNS network storage server.
+ true
+ false
+
+ cifs-utils
+ gssproxy
+ nfs-utils
+ nfs4-acl-tools
+ samba
+ isns-utils
+
+
+
+ fonts
+ Fonts
+ Fonts packages for rendering text on the desktop.
+ true
+ false
+
+ dejavu-sans-fonts
+ dejavu-sans-mono-fonts
+ dejavu-serif-fonts
+
+
+
+ gnome-desktop
+ GNOME
+ GNOME is a highly intuitive and user-friendly desktop environment.
+ true
+ false
+
+ ModemManager
+ NetworkManager-adsl
+ avahi
+ glib-networking
+ glibc-all-langpacks
+ polkit
+
+
+
+ graphical-admin-tools
+ Graphical Administration Tools
+ Graphical system administration tools for managing many aspects of a system.
+ true
+ true
+
+ setools-console
+
+
+
+ hardware-monitoring
+ Hardware Monitoring Utilities
+ A set of tools to monitor server hardware.
+ true
+ false
+
+ mcelog
+ smartmontools
+ intel-cmt-cat
+
+
+
+ hardware-support
+ Hardware Support
+ This group is a collection of tools for various hardware specific utilities.
+ true
+ false
+
+ bolt
+ iwl100-firmware
+ iwl1000-firmware
+ iwl105-firmware
+ iwl135-firmware
+ iwl2000-firmware
+ iwl2030-firmware
+ iwl3160-firmware
+ iwl5000-firmware
+ iwl5150-firmware
+ iwl6000g2a-firmware
+ iwl6000g2b-firmware
+ iwl6050-firmware
+ iwl7260-firmware
+ libertas-sd8787-firmware
+ netronome-firmware
+ usb_modeswitch
+ lsscsi
+ opensc
+ openssl-pkcs11
+ pcsc-lite
+ pcsc-lite-ccid
+
+
+
+ headless-management
+ Headless Management
+ Tools for managing the system without an attached graphical console.
+ true
+ true
+
+ cockpit-bridge
+ cockpit-system
+ cockpit-ws
+ openssh-server
+
+
+
+ infiniband
+ Infiniband Support
+ Software designed for supporting clustering, grid connectivity, and low-latency, high bandwidth storage using RDMA-based InfiniBand, iWARP, RoCE, and OPA fabrics.
+ true
+ false
+
+ libibverbs
+ libibverbs-utils
+ librdmacm
+ librdmacm-utils
+ rdma-core
+ ibacm
+ iwpmd
+ libibumad
+ perftest
+ srp_daemon
+ opensm
+
+
+
+ large-systems
+ Large Systems Performance
+ Performance support tools for large systems.
+ true
+ false
+
+ numactl
+ numad
+ hwloc
+ numatop
+
+
+
+ legacy-unix
+ Legacy UNIX Compatibility
+ Compatibility programs for migration from or working with legacy UNIX environments.
+ true
+ true
+
+ mksh
+
+
+
+ mail-server
+ Mail Server
+ These packages allow you to configure an IMAP or SMTP mail server.
+ true
+ false
+
+ cyrus-sasl
+
+
+
+ mainframe-access
+ Mainframe Access
+ Tools for accessing mainframe computing resources.
+ true
+ false
+
+ x3270-text
+
+
+
+ network-file-system-client
+ Network File System Client
+ Enables the system to attach to network storage.
+ true
+ false
+
+ autofs
+ cifs-utils
+ device-mapper-multipath
+ fcoe-utils
+ gssproxy
+ iscsi-initiator-utils
+ lldpad
+ nfs-utils
+ nfs4-acl-tools
+ cachefilesd
+
+
+
+ network-server
+ Network Servers
+ These packages include network-based servers such as DHCP, Kerberos and NIS.
+ true
+ true
+
+ dhcp-server
+ krb5-server
+ syslinux
+
+
+
+ network-tools
+ Networking Tools
+ Tools for configuring and analyzing computer networks.
+ true
+ false
+
+ ipset
+ iptraf-ng
+ lksctp-tools
+ netlabel_tools
+ stunnel
+
+
+
+ networkmanager-submodules
+ Common NetworkManager submodules
+ This group contains NetworkManager submodules that are commonly used, but may not be wanted in some streamlined configurations.
+ true
+ false
+
+ NetworkManager-bluetooth
+ NetworkManager-wifi
+ NetworkManager-wwan
+ iptables-nft
+
+
+
+ performance
+ Performance Tools
+ Tools for diagnosing system and application-level performance problems.
+ true
+ false
+
+ elfutils
+ iotop
+ strace
+ hdparm
+ tuned-profiles-cpu-partitioning
+
+
+
+ python-web
+ Python Web
+ Basic Python web application support.
+ true
+ false
+
+ libcurl
+
+
+
+ remote-system-management
+ Remote Management for Linux
+ Remote management interface for Red Hat Enterprise Linux.
+ true
+ false
+
+ cockpit
+
+
+
+ scientific
+ Scientific Support
+ Tools for mathematical and scientific computations, and parallel computing.
+ true
+ true
+
+ atlas
+ units
+
+
+
+ security-tools
+ Security Tools
+ Security tools for integrity and trust verification.
+ true
+ true
+
+ hmaccalc
+ tpm2-tools
+ tss2
+
+
+
+ server-product
+ Server product core
+ Packages mandatory for the server product.
+ true
+ false
+
+ chrony
+ polkit
+ realmd
+ redhat-release
+ redhat-release-eula
+ NetworkManager-config-server
+ NetworkManager-team
+
+
+
+ smart-card
+ Smart Card Support
+ Support for using smart card authentication.
+ true
+ true
+
+ pcsc-lite-ccid
+ opencryptoki
+ opencryptoki-icsftok
+ opencryptoki-swtok
+ opensc
+ openssl-pkcs11
+ sssd-polkit-rules
+
+
+
+ smb-server
+ Windows File Server
+ This package group allows you to share files between Linux and MS Windows(tm) systems.
+ true
+ false
+
+ samba
+ cifs-utils
+
+
+
+ standard
+ Standard
+ The standard installation of Red Hat Enterprise Linux.
+ true
+ false
+
+ acl
+ at
+ attr
+ bc
+ cpio
+ crontabs
+ cyrus-sasl-plain
+ dbus
+ ed
+ file
+ irqbalance
+ kpatch
+ kpatch-dnf
+ logrotate
+ lsof
+ mcelog
+ microcode_ctl
+ net-tools
+ pciutils
+ psacct
+ quota
+ redhat-release
+ redhat-release-eula
+ sudo
+ symlinks
+ systemd-udev
+ tar
+ tree
+ tuned
+ util-linux-user
+ bash-completion
+ bluez
+ bpftool
+ bzip2
+ chrony
+ cockpit
+ cryptsetup
+ dos2unix
+ dosfstools
+ ethtool
+ gnupg2
+ iprutils
+ kmod-kvdo
+ ledmon
+ lvm2
+ mailcap
+ man-pages
+ mdadm
+ mlocate
+ mtr
+ nano
+ nvme-cli
+ realmd
+ rsync
+ smartmontools
+ sos
+ sssd
+ strace
+ teamd
+ time
+ unzip
+ usbutils
+ vdo
+ virt-what
+ which
+ words
+ xfsdump
+ zip
+ cifs-utils
+ cockpit-doc
+ fwupd
+ ima-evm-utils
+ nfs-utils
+ nvmetcli
+ traceroute
+ vdo-support
+ zsh
+
+
+
+ system-tools
+ System Tools
+ This group is a collection of various tools for the system, such as the client for connecting to SMB shares and tools to monitor network traffic.
+ true
+ true
+
+ chrony
+ cifs-utils
+ openldap-clients
+ setserial
+ tmux
+ zsh
+ autofs
+ chrpath
+ environment-modules
+ fuse
+ hardlink
+ initscripts
+ initscripts-service
+ iotop
+ lzop
+ netconsole-service
+ readonly-root
+
+
+
+ workstation-product
+ Workstation product core
+ Packages mandatory for the workstation product.
+ true
+ false
+
+ acl
+ attr
+ bash-completion
+ bc
+ bzip2
+ chrony
+ cifs-utils
+ cpio
+ crontabs
+ cryptsetup
+ cyrus-sasl-plain
+ dnf
+ dnf-plugins-core
+ dos2unix
+ dosfstools
+ ethtool
+ file
+ glibc-all-langpacks
+ gnupg2
+ logrotate
+ lrzsz
+ lsof
+ mailcap
+ man-pages
+ mcelog
+ mdadm
+ microcode_ctl
+ mlocate
+ mtr
+ net-tools
+ nfs-utils
+ pciutils
+ polkit
+ psacct
+ quota
+ realmd
+ redhat-release
+ redhat-release-eula
+ rsync
+ sos
+ sssd
+ sudo
+ symlinks
+ systemd-udev
+ tar
+ time
+ traceroute
+ tree
+ unzip
+ usbutils
+ which
+ words
+ zip
+
+
+
+ development
+ Development
+ Packages which provide functionality for developing and building applications.
+ 90
+
+ additional-devel
+ development
+
+
+
+ servers
+ Servers
+ Software used for running network servers
+ 20
+
+ file-server
+ mail-server
+ network-server
+
+
+
+ base-system
+ System
+ Core system components.
+ 10
+
+ dial-up
+ hardware-monitoring
+ infiniband
+ large-systems
+ legacy-unix
+ mainframe-access
+ network-tools
+ performance
+ scientific
+ security-tools
+ smart-card
+ standard
+
+
+
+ desktops
+ Desktops
+ Desktops and thin clients.
+ 70
+
+ fonts
+ gnome-desktop
+
+
+
+ custom-environment
+ Custom Operating System
+ Basic building block for a custom RHEL system.
+ 99
+
+ core
+
+
+ standard
+
+
+
+ minimal-environment
+ Minimal Install
+ Basic functionality.
+ 3
+
+ core
+
+
+ standard
+
+
+
+ server-product-environment
+ Server
+ An integrated, easy-to-manage server.
+ 2
+
+ core
+ hardware-support
+ headless-management
+ server-product
+ standard
+
+
+ debugging
+ file-server
+ gnome-desktop
+ hardware-monitoring
+ infiniband
+ mail-server
+ network-file-system-client
+ network-server
+ performance
+ remote-system-management
+ smb-server
+
+
+
diff --git a/test/data/testrepos/baseos/repodata/repomd.xml b/test/data/testrepos/baseos/repodata/repomd.xml
index c02dce54..e2f0fb0a 100644
--- a/test/data/testrepos/baseos/repodata/repomd.xml
+++ b/test/data/testrepos/baseos/repodata/repomd.xml
@@ -1,42 +1,72 @@
- 1644263915
+ 9-stream
+
+ CentOS Stream 9
+
- 130494033cb9bffa40828ebc814d016920d9ce5d60041467af283ffcf38adef0
- 4fd621cd9253a7d7013af758bbf4b200142f29515ad0fb99d544864a5ad7e4a7
-
- 1644263915
- 1063488
- 8471009
+ 08c8cf048b8955d096460ed44de417a97db93ca8e5ee4623390e8c585da34c59
+ 3c985ec6488a6c74913abcf607d6800c165adf5112885550ebf7c3bac6a1f2d5
+
+ 1722348013
+ 6432125
+ 53533921
- 7b99933643e8bff43d3d82180e7d678fac89b6a1b9b8f5f88ea93a5c3b9b5dbd
- ed7d3c472ce8251bd9747e5fdc5c5e294de84fe3c77f62ecf5911483208e96ee
-
- 1644263915
- 612567
- 5894169
+ 0fd6cb69a8ad078b319cba9d0aac16661cef181d4b9177439f241002f131a916
+ a236757191ef6cf6848cc23d21ee5064e5abeedd0c8a4ffcb9b13f7cd27e2f51
+
+ 1722348013
+ 2127840
+ 25354073
- 07a7871013790fe15ece5d85aa1cfdd33813368882f8dfd58079f9c72926c609
- 03b2abe3a30652b84daa0c7e37cdb9b7e9c12b44c6f96ba8aed87849fa5121c9
-
- 1644263915
- 532333
- 4123156
+ 33d1294e3b419a93ed7e4dbee989c7b8469f9f285fe73fb3f47dfdaf75c464d1
+ ecdcb2a97a62ea548bf97643f2d3ef7fc5bfe09ecc66260e4855615a10b19592
+
+ 1722348013
+ 5719884
+ 34843589
+
+
+ 7f0c8712a8b7bfb6742a40f9832b892e4483f22222545bafbd9a6c48e6fd00e1
+ d11266b82a2373b45908548f70cd52bc248de3fe327267e372fbcfa7b908f66a
+
+ 1722348029
+ 6335720
+ 64315392
+ 10
+
+
+ 99d5fc0767ad164c357e157ead2f968e26f59f4acd8425002107b19817ea17b5
+ 1b9ed215a20bb4818295985b4921db210b3ee1ff9186481e25b0ab3d632b89d3
+
+ 1722348017
+ 1830848
+ 15183872
+ 10
+
+
+ 2116f915436f213becd2e303e0a625786116dea702be3c211ba6e6f22137381c
+ e541358539b2feeb9c6f0c020e1114ed6add89e017ab141942ef57cc9830d75f
+
+ 1722348018
+ 910404
+ 35278848
+ 10
- 40232bada337516d6e75012012436d8138a529f3ac7171f07fbef5bd6c6e6a3a
-
- 1644263907
- 39248
+ ee41540e54efdb992b0d2fe56f16df2d84c804295d414f65aae6d1d91a339ee3
+
+ 1722348010
+ 39259
-
- 2ac4e27794f840034a13bb60800aba194e89fcd2175c87f57cfbd649139feff3
- 40232bada337516d6e75012012436d8138a529f3ac7171f07fbef5bd6c6e6a3a
-
- 1644263915
- 4733
- 39248
+
+ 1c134685819df0907fb328edad9528293196943b7494a017a6b7e89d6da878b4
+ ee41540e54efdb992b0d2fe56f16df2d84c804295d414f65aae6d1d91a339ee3
+
+ 1722348013
+ 4604
+ 39259