sync with 8.7 stream dev

common/include-excludes.conf

@@ -66,50 +66,28 @@ additional_packages = [
             "bind9.16-libs", #ENGCMP-1675
             "bind9.16-license", #ENGCMP-1675
             "cockpit-leapp", #ENGCMP-1819
+            "dotnet",
             "libasan5", #RCM-61474
             "libubsan1",
             "gnome-software-editor",
             "pipewire-docs",
-            "python3-pyghmi", #RHELCMP-6299 RhBug 1992470
             "gcc-toolset-11-annobin-annocheck-debuginfo", #RHELCMP-5799
             "gcc-toolset-11-annobin-debuginfo", #RHELCMP-5799
             "gcc-toolset-11-annobin-plugin-gcc-debuginfo", #RHELCMP-5799
-            "sblim-gather", #RHBug 1970346, RHELCMP-5640
-            "coreos-installer", #RHBug 1973159, RHELCMP-5730
-            "ansible-collection-microsoft-sql", #RHBug 1974786, RHELCMP-5772
-            "tesseract",
             "gcc-toolset-11-annobin-debuginfo", #RHELCMP-5799
             "gcc-toolset-11-gcc-gdb-plugin-debuginfo", #RHELCMP-5799
             "gcc-toolset-11-systemtap-server-debuginfo", #RHELCMP-5799
-            "samba-vfs-iouring", #RhBug 1974792
+            "gcc-toolset-12", #ENGCMP-2287
-            "sevctl", #RHBug 1986032, RHELCMP-6101
+            "gcc-toolset-12-annobin-annocheck", #ENGCMP-2383
-            "coreos-installer-bootinfra", #RHELCMP-6277
+            "gcc-toolset-12-annobin-docs", #ENGCMP-2383
-            "rig", #RHELCMP-6677
+            "gcc-toolset-12-annobin-plugin-gcc", #ENGCMP-2383
+            "gcc-toolset-12-binutils", #ENGCMP-2303
+            "gcc-toolset-12-gcc", #ENGCMP-2338
+            "gcc-toolset-12-gdb", #ENGCMP-2334
+            "gcc-toolset-12-dwz", #ENGCMP-2339
             "virt-v2v", # RHBug 2005288, RHELCMP-6733
-            "java-17-openjdk", #RHBug 1982386, RHELCMP-6030
-            "samba-vfs-iouring", #RhBug 1974792
-            "sevctl", #RHBug 1986032, RHELCMP-6101
-            "coreos-installer-bootinfra", #RHELCMP-6277
-            "coreos-installer-dracut", #ENGCMP-1582
-            "gcc-toolset-11-gcc-plugin-devel", #RHELCMP-6247
-            "ansible-collection-redhat-rhel_mgmt", #RHELCMP-6300 RhBug 1992497
-            "java-17-openjdk-demo", # RHELCMP-6345
-            "java-17-openjdk-devel", # RHELCMP-6345
-            "java-17-openjdk-jmods", # RHELCMP-6345
-            "java-17-openjdk-src", # RHELCMP-6345
-            "java-17-openjdk-static-libs", # RHELCMP-6345
-            "java-17-openjdk-javadoc", # RHELCMP-6345
-            "java-17-openjdk-javadoc-zip", # RHELCMP-6345
-            "gcc-toolset-11-libgccjit", # RHELCMP-6355
-            "gcc-toolset-11-libgccjit-devel", # RHELCMP-6355
-            "pcm", # RHELCMP-6356
-            "jigawatts", # RHELCMP-6427
-            "gcc-toolset-11-dyninst-devel" # Jira: RHELCMP-6377
             "swtpm", # Jira: RHELCMP-6824
             "libtpms", # RHELCMP-6729
-            "qatzip", # RHELCMP-7085
-            "qatzip-libs", #ENGCMP-1643
-            "weldr-client", # RHELCMP-7099
             "leapp", # RHBug: 2017461, Jira: RHELCMP-7153
             "leapp-repository", # RHELCMP-7154
             "grafana-azure-monitor",
@@ -124,15 +102,6 @@ additional_packages = [
             "grafana-postgres",
             "grafana-prometheus",
             "grafana-stackdriver",
-            "stress-ng", # RHELCMP-7214
-            "osbuild-composer-dnf-json", #ENGCMP-1606
-            "python38-resolvelib", #RHELCMP-7210
-            "sshpass", #RHELCMP-7206
-            "rsyslog-mmfields", #ENGCMP-1641
-            "fido-device-onboard", # RHBug: 2024180, RHELCMP-7321
-            "gnome-shell-extension-heads-up-display", #ENGCMP-1644
-            "hyperv-tools", #ENGCMP-1668
-            "nmstate-libs", #ENGCMP-1702
             "php-pecl-xdebug3", #ENGCMP-1718
             "fdo-admin-cli", #ENGCMP-1993
             "fdo-init", #ENGCMP-1717
@@ -179,18 +148,44 @@ additional_packages = [
             "lpsolve", #ENGCMP-1847
             "greenboot-default-health-checks", #ENGCMP-1801
             "fence-agents-ibm-powervs", #ENGCMP-2002
+            "fence-agents-ibm-vpc",
             "fence-agents-kubevirt", #ENGCMP-2002
             "fence-virtd-cpg", #ENGCMP-1972
+            "poppler-qt5",
             "python3-dnf-plugin-modulesync", #ENGCMP-2018
+            "python3-lasso", #ENGCMP-2278
+            "redhat-cloud-client-configuration", #ENGCMP-2395
+            "libzdnn", #ENGCMP-2057
+            "tuned-profiles-postgresql", #ENGCMP-2126
+            "ipxe-bootimgs-aarch64", #ENGCMP-2123
+            "ipxe-bootimgs-x86", #ENGCMP-2123
+            "spirv-tools", #ENGCMP-2316
+            "sssd-idp", #ENGCMP-2310
+            "vulkan-headers", #ENGCMP-2316
+            "vulkan-loader", #ENGCMP-2316
+            "vulkan-loader-devel", #ENGCMP-2316
+            "vulkan-tools", #ENGCMP-2316
+            "vulkan-validation-layers", #ENGCMP-2316
+            "yara", #ENGCMP-2352
         ]
     }),
+    ("^AppStream$", {
+         "aarch64": [],
+         "ppc64le": [],
+         "x86_64": [
+            "open-vm-tools-salt-minion", #ENGCMP-2295
+         ],
+         "s390x": [],
+    
+    }),
     ("^BaseOS$", {
         "*": [
             "python3-debuginfo", # RCM-73713
             "compat-hwloc1", #RhBug 1979150
-            "libqrtr-glib", #RHBug 2016402, RHELCMP-7140
             "NetworkManager-initscripts-updown", #ENGCMP-1991
             "shadow-utils-subid", #ENGCMP-1597
+            "glibc-doc",
+            "glibc-gconv-extra",
             #"kmod-redhat-oracleasm",
         ]
     }),
@@ -1121,6 +1116,11 @@ additional_packages = [
 
     ("^PowerTools$", {
         "*": [
+            "sblim-gather-provider", #RHBug 1959078, RHELCMP-6212
+            "java-17-openjdk-*fastdebug*", #ENGCMP-2141
+            "java-17-openjdk-*slowdebug*", # Jira: RHELCMP-6345
+            "tesseract-devel", # RHELCMP-5762
+            "shadow-utils-subid-devel", #ENGCMP-1597
             "libdnf-devel",
             "librepo-devel",
             "librhsm-devel",
@@ -1130,10 +1130,6 @@ additional_packages = [
             "dotnet-sdk-3.1-source-built-artifacts",
             "dotnet-sdk-5.0-source-built-artifacts",
             "libcomps-devel", #RhBug 1960616
-            "sblim-gather-provider", #RHBug 1959078, RHELCMP-6212
-            "java-17-openjdk-*slowdebug*", # Jira: RHELCMP-6345
-            "tesseract-devel", # RHELCMP-5762
-            "shadow-utils-subid-devel", #ENGCMP-1597
         ]
     }),
 
@@ -1141,35 +1137,27 @@ additional_packages = [
         "aarch64": [
             "java-1.8.0-openjdk-*slowdebug*", # Jira: RHELCMP-4189
             "java-11-openjdk-*slowdebug*", # Jira: RHELCMP-4189
-            "java-17-openjdk-*slowdebug*", # Jira: RHELCMP-6345
+            "java-1.8.0-openjdk-*fastdebug*", #ENGCMP-2141
+            "java-11-openjdk-*fastdebug*" #ENGCMP-2141
         ],
         "ppc64le": [
             "java-1.8.0-openjdk-*slowdebug*", # Jira: RHELCMP-4189
             "java-11-openjdk-*slowdebug*", # Jira: RHELCMP-4189
-            "java-17-openjdk-*slowdebug*", # Jira: RHELCMP-6345
+            "java-1.8.0-openjdk-*fastdebug*", #ENGCMP-2141
+            "java-11-openjdk-*fastdebug*" #ENGCMP-2141
         ],
         "x86_64": [
             "java-1.8.0-openjdk-*slowdebug*", # Jira: RHELCMP-4189
             "java-11-openjdk-*slowdebug*", # Jira: RHELCMP-4189
+            "java-1.8.0-openjdk-*fastdebug*", #ENGCMP-2141
+            "java-11-openjdk-*fastdebug*" #ENGCMP-2141
             "dotnet5.0-build-reference-packages",
-            "java-17-openjdk-*slowdebug*", # Jira: RHELCMP-6345
         ],
     }),
     ("^PowerTools$", {
         "x86_64": [
             "java-1.8.0-openjdk-*fastdebug*", # Jira: RHELCMP-4189
             "java-11-openjdk-*fastdebug*", # Jira: RHELCMP-4189
-            "java-17-openjdk-*fastdebug*", # Jira: RHELCMP-6345
-        ],
-        "aarch64": [
-            "java-1.8.0-openjdk-*fastdebug*", # Jira: RHELCMP-6347
-            "java-11-openjdk-*fastdebug*", # Jira: RHELCMP-6347
-            "java-17-openjdk-*fastdebug*", # Jira: RHELCMP-6345
-        ],
-        "ppc64le": [
-            "java-1.8.0-openjdk-*fastdebug*", # Jira: RHELCMP-6347
-            "java-11-openjdk-*fastdebug*", # Jira: RHELCMP-6347
-            "java-17-openjdk-*fastdebug*", # Jira: RHELCMP-6345
         ]
     }),
 

plus.conf

@@ -68,6 +68,7 @@ additional_packages = [
       'open-vm-tools',
       'open-vm-tools-desktop',
       'open-vm-tools-sdmp',
+      'open-vm-tools-sdmp-salt-minion',
     ],
 	}),
 ]

variants.xml

@@ -181,6 +181,7 @@
       <module>nodejs:12</module>
       <module>nodejs:14</module>
       <module>nodejs:16</module>
+      <module>nodejs:18</module>
       <module>parfait:0.5</module>
       <module>perl-App-cpanminus:1.7044</module>
       <module>perl-DBD-MySQL:4.046</module>
@@ -217,6 +218,7 @@
       <module>ruby:2.6</module>
       <module>ruby:2.7</module>
       <module>ruby:3.0</module>
+      <module>ruby:3.1</module>
       <module>rust-toolset:rhel8</module>
       <module>satellite-5-client:1.0</module>
       <module>scala:2.10</module>