From 981f750468ba3105019662de810cd4c357f93d22 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Jul 31 2024 22:04:05 +0000
Subject: Sync additional_and_filter_packages.conf with c10s


---

diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 18e8ef8..ab57d22 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -54,74 +54,154 @@ additional_packages = [
     }),
     ("^BaseOS$", {
         "*": [
-            "liblockfile", #ENGCMP-2535
+            "openssl-fips-provider", #ENGCMP-3815
             "python3-gobject-base-noarch", #ENGCMP-2400
+            "python3-samba-dc", #ENGCMP-3007
             "python3.*-debuginfo", #ENGCMP-1433
+            "rhel-net-naming-sysattrs", #ENGCMP-3784
+            "samba-tools", #ENGCMP-3007
+            "samba-usershares", #ENGCMP-3007
+            "sssd-passkey", #ENGCMP-3467
             "subscription-manager-cockpit", #ENGCMP-2427
             "subscription-manager-rhsm-certificates", #ENGCMP-2357
+            "kernel-modules-core", #ENGCMP-2899
+            "kernel-debug-modules-core", #ENGCMP-2899
+            "kpatch", #ENGCMP-3983
+            "dhcpcd", #ENGCMP-3945
+            "kdump-utils", #ENGCMP-4007
+            "makedumpfile", #ENGCMP-4007
+            "prefixdevname", #ENGCMP-4041
+            "libcpuid", #ENGCMP-4068
+            "plocate", #ENGCMP-4074
+            "ktls-utils", #ENGCMP-4189
+            "libpq", #ENGCMP-4203
+            "vdo", #ENGCMP-4262
+            "erofs-utils", #ENGCMP-4284
+            "erofs-fuse", #ENGCMP-4284
         ]
     }),
     ("^BaseOS$", {
          "aarch64": [
+            "kernel-64k", #ENGCMP-2800
+            "kernel-64k-core", #ENGCMP-2800
+            "kernel-64k-debug", #ENGCMP-2800
+            "kernel-64k-debug-core", #ENGCMP-2800
+            "kernel-64k-debug-modules", #ENGCMP-2800
+            "kernel-64k-debug-modules-core", #ENGCMP-2899, ENGCMP-2800
+            "kernel-64k-debug-modules-extra", #ENGCMP-2800
+            "kernel-64k-modules", #ENGCMP-2800
+            "kernel-64k-modules-extra", #ENGCMP-2800
+            "kernel-64k-modules-core", #ENGCMP-2899, ENGCMP-2800
          ],
          "ppc64le": [
          ],
          "x86_64": [
+            "kernel-uki-virt", #ENGCMP-2899
+            "kernel-debug-uki-virt", #ENGCMP-2899
          ],
          "s390x": [
+            "kernel-zfcpdump-modules-core",
+            "libibverbs-utils", #ENGCMP-3507
          ],
      }),
     ("^AppStream$", {
         "*": [
             "aardvark-dns", #ENGCMP-2515
-            "adobe-source-code-pro-fonts", #ENGCMP-2390
             "alsa-plugins-pulseaudio", #ENGCMP-2359
-            "aspnetcore-runtime-8.0", #ENGCMP-2586
-            "aspnetcore-targeting-pack-8.0", #ENGCMP-2586
+            "aspnetcore-runtime-8.0", #ENGCMP-3375
+            "aspnetcore-targeting-pack-8.0", #ENGCMP-3375
+            "autoconf-latest", #ENGCMP-3691
+            "bootc", #ENGCMP-3622
             "capstone", #ENGCMP-2591
-            "dotnet-apphost-pack-8.0", #ENGCMP-2586
+            "cepces", #ENGCMP-3552
+            "cepces-certmonger", #ENGCMP-3790
+            "cepces-selinux", #ENGCMP-3803
+            "cloud-utils-growpart",
+            "cups-browsed", #ENGCMP-3862
+            "cups-filters-driverless", #ENGCMP-3862
+            "cockpit-ostree", #ENGCMP-3233
+            "composefs", #ENGCMP-3802
+            "dotnet-apphost-pack-8.0", #ENGCMP-3375
             "dotnet-host", #ENGCMP-2586
-            "dotnet-hostfxr-8.0", #ENGCMP-2586
-            "dotnet-runtime-8.0", #ENGCMP-2586
-            "dotnet-sdk-8.0", #ENGCMP-2586
-            "dotnet-targeting-pack-8.0", #ENGCMP-2586
-            "dotnet-templates-8.0", #ENGCMP-2586
+            "dotnet-hostfxr-8.0", #ENGCMP-3375
+            "dotnet-runtime-8.0", #ENGCMP-3375
+            "dotnet-sdk-8.0", #ENGCMP-3375
+            "dotnet-targeting-pack-8.0", #ENGCMP-3375
+            "dotnet-templates-8.0", #ENGCMP-3375
             "dpdk-devel", #ENGCMP-2205
+            "drgn", #ENGCMP-3490
+            "ecj", #ENGCMP-2928
             "egl-utils", #ENGCMP-2476
+            "evolution-data-server-ui", #ENGCMP-3478
+            "evolution-data-server-ui-devel", #ENGCMP-3477
+            "fido2-tools", #ENGCMP-3526
             "freeglut-devel", #ENGCMP-2073
             "frr-selinux", #ENGCMP-2697
-            "gcc-toolset-12", #ENGCMP-2391
-            "gcc-toolset-12-annobin-annocheck", #ENGCMP-2384
-            "gcc-toolset-12-annobin-docs", #ENGCMP-2384
-            "gcc-toolset-12-annobin-plugin-gcc", #ENGCMP-2384
-            "gcc-toolset-12-binutils", #ENGCMP-2415
-            "gcc-toolset-12-binutils-devel", #ENGCMP-2415
-            "gcc-toolset-12-binutils-gold", #ENGCMP-2415
-            "gcc-toolset-12-build", #ENGCMP-2391
-            "gcc-toolset-12-dwz", #ENGCMP-2402
-            "gcc-toolset-12-gcc", #ENGCMP-2405
-            "gcc-toolset-12-gcc-c++", #ENGCMP-2405 
-            "gcc-toolset-12-gcc-gfortran", #ENGCMP-2405 
-            "gcc-toolset-12-gcc-plugin-devel", #ENGCMP-2405 
-            "gcc-toolset-12-gdb", #ENGCMP-2416
-            "gcc-toolset-12-gdbserver", #ENGCMP-2416
-            "gcc-toolset-12-libasan-devel", #ENGCMP-2405 
-            "gcc-toolset-12-libatomic-devel", #ENGCMP-2405 
-            "gcc-toolset-12-libgccjit", #ENGCMP-2405 
-            "gcc-toolset-12-libgccjit-devel", #ENGCMP-2405 
-            "gcc-toolset-12-libgccjit-docs", #ENGCMP-2405 
-            "gcc-toolset-12-libitm-devel", #ENGCMP-2405 
-            "gcc-toolset-12-liblsan-devel", #ENGCMP-2405 
-            "gcc-toolset-12-libquadmath-devel", #ENGCMP-2405 
-            "gcc-toolset-12-libstdc++-devel", #ENGCMP-2405 
-            "gcc-toolset-12-libstdc++-docs", #ENGCMP-2405 
-            "gcc-toolset-12-libtsan-devel", #ENGCMP-2405 
-            "gcc-toolset-12-libubsan-devel", #ENGCMP-2405 
-            "gcc-toolset-12-offload-nvptx", #ENGCMP-2405 
-            "gcc-toolset-12-runtime", #ENGCMP-2391
+            "gcc-toolset-15", #ENGCMP-3157
+            "gcc-toolset-15-annobin-annocheck", #ENGCMP-3279
+            "gcc-toolset-15-annobin-docs", #ENGCMP-3279
+            "gcc-toolset-15-annobin-plugin-gcc", #ENGCMP-3279
+            "gcc-toolset-15-binutils", #ENGCMP-3146
+            "gcc-toolset-15-binutils-devel", #ENGCMP-3279
+            "gcc-toolset-15-binutils-gold", #ENGCMP-3279
+            "gcc-toolset-15-build", #ENGCMP-3279
+            "gcc-toolset-15-dwz", #ENGCMP-3142
+            "gcc-toolset-15-gcc", #ENGCMP-3267
+            "gcc-toolset-15-gcc-c++", #ENGCMP-3296
+            "gcc-toolset-15-gcc-gfortran", #ENGCMP-3279
+            "gcc-toolset-15-gcc-plugin-annobin", #ENGCMP-3279
+            "gcc-toolset-15-gcc-plugin-devel", #ENGCMP-3279
+            "gcc-toolset-15-gdb", #ENGCMP-3129
+            "gcc-toolset-15-gdbserver", #ENGCMP-3279
+            "gcc-toolset-15-libasan-devel", #ENGCMP-3279
+            "gcc-toolset-15-libatomic-devel", #ENGCMP-3279
+            "gcc-toolset-15-libgccjit", #ENGCMP-3279
+            "gcc-toolset-15-libgccjit-devel", #ENGCMP-3279
+            "gcc-toolset-15-libgccjit-docs", #ENGCMP-3279
+            "gcc-toolset-15-libitm-devel", #ENGCMP-3279
+            "gcc-toolset-15-liblsan-devel", #ENGCMP-3279
+            "gcc-toolset-15-libquadmath-devel", #ENGCMP-3279
+            "gcc-toolset-15-libstdc++-devel", #ENGCMP-3279
+            "gcc-toolset-15-libstdc++-docs", #ENGCMP-3279
+            "gcc-toolset-15-libtsan-devel", #ENGCMP-3279
+            "gcc-toolset-15-libubsan-devel", #ENGCMP-3279
+            "gcc-toolset-15-offload-nvptx", #ENGCMP-3279
+            "gcc-toolset-15-runtime", #ENGCMP-3279
             "gnome-kiosk-script-session", #ENGCMP-2499
             "gnome-kiosk-search-appliance", #ENGCMP-2499
+            "gnome-shell-extension-custom-menu", #ENGCMP-3337
+            "gnome-shell-extension-dash-to-panel", #ENGCMP-3541
+            "gnome-software-fedora-langpacks", #ENGCMP-4281
+            "google-crosextra-caladea-fonts", #ENGCMP-3140
+            "gpsd", #ENGCMP-3941
+            "gpsd-clients", #ENGCMP-3941
+            "grafana-selinux", #ENGCMP-3571
+            "graphviz-ruby", #ENGCMP-3570
+            "gstreamer1-plugins-base-tools", #ENGCMP-2907
+            "gstreamer1-rtsp-server", #ENGCMP-3178
+            "gvisor-tap-vsock", #ENGCMP-3491
+            "gstreamer1-plugins-base-tools", #ENGCMP-2907
+            "gstreamer1-rtsp-server", #ENGCMP-3178
+            "dogtag-pki-est", #ENGCMP-2798
+            "ipp-usb", #ENGCMP-3862
+            "ignition-edge", #ENGCMP-2770
             "ignition-validate", #ENGCMP-2656
+            "intel-lpmd", #ENGCMP-3806
+            "java-21-openjdk", #ENGCMP-3350
+            "java-21-openjdk-demo", #ENGCMP-3350
+            "java-21-openjdk-devel", #ENGCMP-3350
+            "java-21-openjdk-headless", #ENGCMP-3350
+            "java-21-openjdk-javadoc-zip", #ENGCMP-3350
+            "java-21-openjdk-javadoc", #ENGCMP-3350
+            "java-21-openjdk-jmods", #ENGCMP-3350
+            "java-21-openjdk-src", #ENGCMP-3350
+            "java-21-openjdk-static-libs", #ENGCMP-3350
+            "jaxb-runtime", #ENGCMP-2881
+            "jaxb-xjc", #ENGCMP-2881
+            "kea", #ENGCMP-3941
+            "kea-hooks", #ENGCMP-3941
+            "kea-doc", #ENGCMP-3941
+            "kea-libs", #ENGCMP-3941
             "keylime", #ENGCMP-2419
             "keylime-agent-rust", #ENGCMP-2420
             "keylime-base", #ENGCMP-2419
@@ -129,28 +209,59 @@ additional_packages = [
             "keylime-selinux", #CS-1194
             "keylime-tenant", #ENGCMP-2419
             "keylime-verifier", #ENGCMP-2419
+            "libadwaita", #ENGCMP-3651
+            "libarchive-devel", #ENGCMP-4182
             "libasan8", #ENGCMP-2405
+            "libblkio", #ENGCMP-3149
             "libgpiod", #ENGCMP-2433
             "libgpiod-devel", #ENGCMP-2433
             "libgpiod-utils", #ENGCMP-2433
             "libi2cd", #ENGCMP-2428
             "libi2cd-devel", #ENGCMP-2428
+            "libkdumpfile", #ENGCMP-3470
+            "libnvme", #ENGCMP-2358
             "libnxz", #ENGCMP-2576
             "libsepol-utils", #ENGCMP-2399
-            "libtsan2", #ENGCMP-2405 
+            "libtsan2", #ENGCMP-2405
+            "libvirt-daemon-common", # ENGCMP-3046
+            "libvirt-daemon-lock", # ENGCMP-3046
+            "libvirt-daemon-log", # ENGCMP-3046
+            "libvirt-daemon-plugin-lockd", # ENGCMP-3046
+            "libvirt-daemon-proxy", # ENGCMP-3046
+            "libvma-utils", #ENGCMP-3384
+            "libxcvt", #ENGCMP-2791 CS-1322
             "libzdnn", #ENGCMP-2244
             "libzdnn-devel", #ENGCMP-2297
+            "libzip-tools", #ENGCMP-3658
+            "lprint", #ENGCMP-3941
             "man-db-cron", #ENGCMP-2595
+            "mingw-qemu-ga-win", #ENGCMP-3177
             "mkpasswd", #ENGCMP-2259
+            "mpdecimal", #ENGCMP-2828
             "netavark", #ENGCMP-2543
             "netstandard-targeting-pack-2.1", #ENGCMP-2586
             "nfsv4-client-utils", #ENGCMP-2493
             "nvme-stas", #ENGCMP-2495
-            "libnvme", #ENGCMP-2358
+            "osbuild-depsolve-dnf", #ENGCMP-3857
+            "oqsprovider", #ENGCMP-3895
+            "pappl", #ENGCMP-3941
             "passt", #ENGCMP-2741
+            "passt-selinux", # ENGCMP-3074
+            "pcp-geolocate", #ENGCMP-3576
+            "pcp-pmda-farm", #ENGCMP-3576
+            "pf-bb-config", #ENGCMP-2857
+            "pipewire-jack-audio-connection-kit-libs", #ENGCMP-3662
+            "pipewire-module-x11", #ENGCMP-3336
             "poppler-qt6", #ENGCMP-2393
+            "postfix-lmdb", #ENGCMP-3295
+            "pyproject-srpm-macros", #ENGCMP-2964
+            "python3-awscrt", #ENGCMP-3828
+            "python3-dnf-plugin-leaves", #ENGCMP-3213
+            "python3-dnf-plugin-show-leaves", #ENGCMP-3213
+            "python3-pefile", #ENGCMP-3231
             "python3-dnf-plugin-modulesync", #ENGCMP-2323
             "python3-alembic", #ENGCMP-2424
+            "python3-gpsd", #ENGCMP-3941
             "python3-greenlet", #ENGCMP-2421
             "python3-keylime", #ENGCMP-2419
             "python3-lark-parser", #ENGCMP-2422
@@ -158,23 +269,142 @@ additional_packages = [
             "python3-i2c-tools", #RHBZ#2072719
             "python3-libgpiod", #ENGCMP-2433
             "python3-libnvme", #ENGCMP-2412
+            "python3-prompt-toolkit", #ENGCMP-3785
             "python3-pyqt6-sip", #ENGCMP-2370
+            "python3-ruamel-yaml-clib", #ENGCMP-3787
             "python3-sqlalchemy", #ENGCMP-2423
+            "python3-tomli", #ENGCMP-3044 CS-1485
             "python3-tornado", #ENGCMP-2418
             "python3-virt-firmware", #ENGCMP-2726
             "python3-wcwidth", #ENGCMP-2093
+            "python3-websockets", #ENGCMP-3788
             "qatlib-service", #ENGCMP-2490
             "redhat-cloud-client-configuration", #ENGCMP-2401
+            "rhel-system-roles", #ENGCMP-3938
+            "rtla", #ENGCMP-2799
+            "rust-analyzer", #ENGCMP-2839
+            "rv", #ENGCMP-3263
+            "s390utils-se-data", #ENGCMP-3789
+            "samba-gpupdate", #ENGCMP-3659, ENGCMP-3720
             "sip6", #ENGCMP-2239
+            "speech-dispatcher-utils", #ENGCMP-4281
             "sssd-idp", #ENGCMP-2276
+            "stratisd-tools", #ENGCMP-3210
+            "synce4l", #ENGCMP-2794
             "system-backgrounds",
+            "systemd-ukify", #ENGCMP-4266
+            "tomcat", #ENGCMP-2927
+            "tomcat-admin-webapps", #ENGCMP-2927
+            "tomcat-docs-webapp", #ENGCMP-2927
+            "tomcat-el-3.0-api", #ENGCMP-2927
+            "tomcat-jsp-2.3-api", #ENGCMP-2927
+            "tomcat-lib", #ENGCMP-2927
+            "tomcat-servlet-4.0-api", #ENGCMP-2927
+            "tomcat-webapps", #ENGCMP-2927
+            "tuned-ppd", #ENGCMP-3941
             "tuned-profiles-postgresql", #ENGCMP-2126
+            "uki-direct", #ENGCMP-3698
             "usbredir-server", #ENGCMP-2719
+            "vulkan-volk-devel", #ENGCMP-3668
+            "xcb-util-cursor", #ENGCMP-3426
+            "xcb-util-cursor-devel", #ENGCMP-3517
             "xdg-desktop-portal-gnome", #ENGCMP-2146
             "xmlstarlet", #ENGCMP-2296
             "xxhash", #ENGCMP-2455
             "xxhash-libs", #ENGCMP-2455
             "yara", #ENGCMP-2372
+            "qt6-qtvirtualkeyboard", #ENGCMP-3950
+            "qt6-qtcharts", #ENGCMP-3948
+            "qt6-qtdatavis", #ENGCMP-3949
+            "qt6-qtnetworkauth", #ENGCMP-3947
+            "zenity", #ENGCMP-3934
+            "openscap-report", #ENGCMP-3939
+            "qt6-qtvirtualkeyboard-devel", #ENGCMP-3946
+            "qt6-qtnetworkauth-devel", #ENGCMP-3947
+            "qt6-qtcharts-devel", #ENGCMP-3948
+            "qt6-qtdatavis3d", #ENGCMP-3949
+            "qt6-qtdatavis3d-devel", #ENGCMP-3949
+            "qt6-qtlottie", #ENGCMP-3950
+            "qt6-qtlottie-devel", #ENGCMP-3950
+            "annobin-libannocheck", #ENGCMP-3916
+            "annobin-plugin-clang", #ENGCMP-3916
+            "annobin-plugin-gcc", #ENGCMP-3916
+            "annobin-plugin-llvm", #ENGCMP-3916
+            "gnome-shell-extension-light-style", #ENGCMP-3979
+            "gnome-shell-extension-system-monitor", #ENGCMP-3979
+            "ansible-collection-microsoft-sql", #ENGCMP-4021
+            "insights-client-ros", #ENGCMP-3824
+            "rubygem-racc", #ENGCMP-4018
+            "lldpd-devel", #ENGCMP-4027
+            "389-ds-base-snmp", #ENGCMP-4038
+            "ruby-bundled-gems", #ENGCMP-4039
+            "python3-pam", #ENGCMP-3942
+            "lld", #ENGCMP-3955
+            "lld-devel", #ENGCMP-3955
+            "lld-libs", #ENGCMP-3955
+            "gnome-ponytail-daemon", #ENGCMP-4052
+            "python3-gnome-ponytail-daemon", #ENGCMP-4052
+            "wireguard-tools", #ENGCMP-4057
+            "nodejs-npm", #ENGCMP-4022
+            "gnome-shell-extension-dash-to-dock", #ENGCMP-4067
+            "python-pam", #ENGCMP-4071
+            "libkdumpfile-devel", #ENGCMP-4078
+            "aspnetcore-runtime-dbg-8.0", #ENGCMP-4088
+            "dotnet-runtime-dbg-8.0", #ENGCMP-4088
+            "dotnet-sdk-dbg-8.0", #ENGCMP-4088
+            "gnutls-fips", #ENGCMP-4092
+            "libdisplay-info", #ENGCMP-4127
+            "valkey", #ENGCMP-4149
+            "valkey-devel", #ENGCMP-4149
+            "tpm2-openssl", #ENGCMP-4154
+            "pcm", #ENGCMP-4090
+            "amd-gpu-firmware", #ENGCMP-4150
+            "intel-gpu-firmware", #ENGCMP-4150
+            "nvidia-gpu-firmware", #ENGCMP-4150
+            "pkcs11-provider", #ENGCMP-4181
+            "ptyxis", #ENGCMP-4204
+            "liboqs", #ENGCMP-3895
+            "liboqs-devel", #ENGCMP-3895
+            "python3-pyqt6-devel", #ENGCMP-4144
+            "qt6-qt5compat-devel", #ENGCMP-4144
+            "qt6-qtlanguageserver-devel", #ENGCMP-4144
+            "qt6-qtquick3d-devel", #ENGCMP-4144
+            "qt6-qtquicktimeline-devel", #ENGCMP-4144
+            "qt6-qtremoteobjects-devel", #ENGCMP-4144
+            "qt6-qtscxml-devel", #ENGCMP-4144
+            "qt6-qtserialbus-devel", #ENGCMP-4144
+            "qt6-qtshadertools-devel", #ENGCMP-4144
+            "qt6-qtspeech-devel", #ENGCMP-4144
+            "qt6-qtspeech-speechd", #ENGCMP-4144
+            "qt6-assistant", #ENGCMP-4144
+            "qt6-qdbusviewer", #ENGCMP-4144
+            "qt6-qtwayland-devel", #ENGCMP-4144
+            "qt6-qtwayland", #ENGCMP-4144
+            "glib2-devel", #ENGCMP-4191
+            "plymouth-devel", #ENGCMP-4191
+            "poppler-qt6", #ENGCMP-4191
+            "dnsconfd", #ENGCMP-4213
+            "dnsconfd-selinux", #ENGCMP-4213
+            "dnsconfd-unbound", #ENGCMP-4213
+            "ipa-selinux-nfast", #ENGCMP-4146
+            "ipa-selinux-luna", #ENGCMP-4146
+            "postgresql-docs", #ENGCMP-4202
+            "postgresql-static", #ENGCMP-4202
+            "postgresql-server-devel", #ENGCMP-4202
+            "postgresql-upgrade-devel", #ENGCMP-4202
+            "postgresql-private-devel", #ENGCMP-4202
+            "postgresql-test", #ENGCMP-4202
+            "mariadb-devel", #ENGCMP-4202
+            "mariadb-embedded-devel", #ENGCMP-4202
+            "mariadb-test", #ENGCMP-4202
+            "postgresql-private-libs", #ENGCMP-4203
+            "xwayland-run", #ENGCMP-4249
+            "cockpit-files", #ENGCMP-4256
+            "udev-hid-bpf", #ENGCMP-4264
+            "udev-hid-bpf-stable", #ENGCMP-4264
+            "redhat-indexhtml", #ENGCMP-4280
+            "go-rpm-templates", #ENGCMP-4270
+            "pgvector", #ENGCMP-4285
         ]
     }),
     ("^AppStream$", {
@@ -182,57 +412,72 @@ additional_packages = [
              "cxl-cli", #ENGCMP-2743
              "cxl-libs", #ENGCMP-2743
              "open-vm-tools-salt-minion", #ENGCMP-2295
+             "pcp-pmda-resctrl", #ENGCMP-3576
              "virt-dib",
              "vorbis-tools",
+             "s390utils", #ENGCMP-3606
+             "libhwasan", #ENGCMP-4019
+             "gcc-offload-amdgcn", #ENGCMP-4019
+             "libgomp-offload-amdgcn", #ENGCMP-4019
          ],
          "aarch64": [
              "virt-dib",
+             "kernel-64k-debug-devel", #ENGCMP-2800
+             "kernel-64k-debug-devel-matched", #ENGCMP-2800
+             "kernel-64k-devel", #ENGCMP-2800
+             "kernel-64k-devel-matched", #ENGCMP-2800
+             "rhc-worker-playbook", #ENGCMP-3127
+             "libhwasan", #ENGCMP-4019
          ],
          "s390x": [
              "libzpc", #ENGCMP-2756
              "virt-dib",
+             "libbpf-tools", #ENGCMP-3842
+             "liblsan", #ENGCMP-4019
+             "libtsan", #ENGCMP-4019
          ],
          "ppc64le": [
              "vorbis-tools",
+             "s390utils", #ENGCMP-3606
          ],
 
      }),
     ("^CRB$", {
         "*": [
-         ], 
+             "dotnet-sdk-8.0-source-built-artifacts", #CS-2160
+             "fabtests", #ENGCMP-4168
+         ],
         "x86_64": [
-             "java-1.8.0-openjdk-*slowdebug*", #ENGCMP-1327
-             "java-11-openjdk-*slowdebug*", #ENGCMP-1327
-             "java-17-openjdk-*slowdebug*", #ENGCMP-1326
-             "java-1.8.0-openjdk-*fastdebug*", #ENGCMP-1327
-             "java-11-openjdk-*fastdebug*", #ENGCMP-1327
-             "java-17-openjdk-*fastdebug*", #ENGCMP-1326
-             "dotnet-sdk-6.0-source-built-artifacts", #CS-1025
+             "java-21-openjdk-*slowdebug*", #ENGCMP-1326
+             "java-21-openjdk-*fastdebug*", #ENGCMP-1326
          ],
          "aarch64": [
-             "java-1.8.0-openjdk-*slowdebug*", #ENGCMP-1327
-             "java-11-openjdk-*slowdebug*", #ENGCMP-1327
-             "java-17-openjdk-*slowdebug*", #ENGCMP-1326
-             "java-1.8.0-openjdk-*fastdebug*", #ENGCMP-1327
-             "java-11-openjdk-*fastdebug*", #ENGCMP-1327
-             "java-17-openjdk-*fastdebug*", #ENGCMP-1326
-             "dotnet-sdk-6.0-source-built-artifacts", #CS-1025
+             "java-21-openjdk-*slowdebug*", #ENGCMP-1326
+             "java-21-openjdk-*fastdebug*", #ENGCMP-1326
          ],
          "s390x": [
-             "java-11-openjdk-*slowdebug*", #ENGCMP-1327
-             "java-17-openjdk-*slowdebug*", #ENGCMP-1326
-             "dotnet-sdk-6.0-source-built-artifacts", #CS-1025
+             "java-21-openjdk-*slowdebug*", #ENGCMP-1326
          ],
          "ppc64le": [
-             "java-1.8.0-openjdk-*slowdebug*", #ENGCMP-1327
-             "java-11-openjdk-*slowdebug*", #ENGCMP-1327
-             "java-17-openjdk-*slowdebug*", #ENGCMP-1326
-             "java-1.8.0-openjdk-*fastdebug*", #ENGCMP-1327
-             "java-11-openjdk-*fastdebug*", #ENGCMP-1327
-             "java-17-openjdk-*fastdebug*", #ENGCMP-1326
+             "java-21-openjdk-*slowdebug*", #ENGCMP-1326
+             "java-21-openjdk-*fastdebug*", #ENGCMP-1326
          ],
      }),
 
+    ("^SAP$", {
+        "*": [
+            "sap-cluster-connector", # ENGCMP-4229
+            "resource-agents-sap", #ENGCMP-4253
+        ]
+    }),
+
+    ("^SAPHANA$", {
+        "*": [
+            "resource-agents-sap-hana", # ENGCMP-4268
+            "resource-agents-sap-hana-scaleout", #ENGCMP-4268
+        ]
+    }),
+
     ("^Buildroot$", {
         "*": [
             "*",