From 3f4044e405e3a7bb0264324fa401b1deccfc6a4a Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Sep 23 2020 19:37:14 +0000
Subject: Updating stream configs


Signed-off-by: Mohan Boddu <mboddu@bhujji.com>

---

diff --git a/c8-stream.conf b/c8-stream.conf
index d5db508..8957218 100644
--- a/c8-stream.conf
+++ b/c8-stream.conf
@@ -148,6 +148,8 @@ variant_as_lookaside = [
     ('HighAvailability', 'AppStream'),
     ("RT", "BaseOS"),
     ("RT", "AppStream"),
+    ("NFV", "BaseOS"),
+    ("NFV", "AppStream"),
 ]
 
 extra_files = [
diff --git a/stream-include-excludes.conf b/stream-include-excludes.conf
index c054f53..975fa0b 100644
--- a/stream-include-excludes.conf
+++ b/stream-include-excludes.conf
@@ -1,11 +1,13 @@
 filter_packages = [
     ("^(BaseOS|AppStream|HighAvailability|NFV|RT|ResilientStorage)$", {
         "*": [
-            "python36",  
-            "gcc-toolset-9-*-testsuite", 
-            "gcc-toolset-9-gcc-plugin-devel", 
-            "tuned-profiles-sap",       
-            "tuned-profiles-sap-hana",  
+            "python36",
+            "gcc-toolset-9-*-testsuite",
+            "gcc-toolset-9-gcc-plugin-devel",
+            "tuned-profiles-sap",
+            "tuned-profiles-sap-hana",
+            "java-1.8.0-openjdk-headless-slowdebug",
+            "java-1.8.0-openjdk-slowdebug",
         ]
     }),
 
@@ -28,7 +30,8 @@ filter_packages = [
     ("^.*$", {
         "*": [
             "kernel-*-internal",  
-            "kpatch-patch-*-internal", 
+            "kpatch-patch-*-internal",
+            "java-11-openjdk-*slowdebug*",
         ]
     }),
 ]
@@ -38,140 +41,18 @@ additional_packages = [
         "*": [
             "libasan5", 
             "libubsan1",
-            "spice-vdagent-win-x64", 
-            "spice-vdagent-win-x86",
-            "usbguard-selinux",
-            "gcc-toolset-9-libasan-devel",
-            "gcc-toolset-9-libatomic-devel",
-            "gcc-toolset-9-liblsan-devel",
-            "gcc-toolset-9-libubsan-devel",
-            "gcc-toolset-9-libtsan-devel",
-            "gcc-toolset-10",
-            "gcc-toolset-10-binutils", 
-            "gcc-toolset-10-dyninst", 
-            "gcc-toolset-10-strace", 
-            "gcc-toolset-10-gcc",
-            "gcc-toolset-10-gcc-gdb-plugin",
-            "gcc-toolset-10-libasan-devel",
-            "gcc-toolset-10-libatomic-devel",
-            "gcc-toolset-10-libitm-devel",
-            "gcc-toolset-10-liblsan-devel",
-            "gcc-toolset-10-libubsan-devel",
-            "gcc-toolset-10-libtsan-devel",
-            "gcc-toolset-10-libstdc++-docs",
-            "gcc-toolset-10-binutils-devel",
-            "gcc-toolset-10-build",
-            "gcc-toolset-10-elfutils-devel",
-            "gcc-toolset-10-elfutils-libelf-devel",
-            "gcc-toolset-10-gdb-doc",
-            "gcc-toolset-10-gdb-gdbserver",
-            "gcc-toolset-10-make-devel",
-            "gcc-toolset-10-systemtap-initscript",
-            "gcc-toolset-10-systemtap-sdt-devel",
-            "gcc-toolset-10-systemtap-server",
-            "gcc-toolset-10-valgrind-devel",
-            "ghostscript-x11", 
-            "python3-libmount", 
-            "alsa-sof-firmware",
-            "alsa-sof-firmware-debug",
-            "itstool", 
-            "js-d3-flame-graph", 
-            "python3-wx-siplib", 
-            "osbuild",
-            "osbuild-composer",
-            "osbuild-ostree",
-            "osbuild-selinux", 
-            "python3-dasbus",
-            "NetworkManager-libreswan-gnome", 
-            "bogofilter",
-            "cmake-gui",
-            "evince",
-            "evince-browser-plugin",
-            "evolution-bogofilter",
-            "evolution-mapi",
-            "evolution-pst",
-            "evolution-spamassassin",
-            "exempi",
-            "exiv2",
-            "gnome-backgrounds-extras",
-            "gnome-getting-started-docs-cs",
-            "gnome-getting-started-docs-de",
-            "gnome-getting-started-docs-es",
-            "gnome-getting-started-docs-fr",
-            "gnome-getting-started-docs-gl",
-            "gnome-getting-started-docs-hu",
-            "gnome-getting-started-docs-it",
-            "gnome-getting-started-docs-pl",
-            "gnome-getting-started-docs-pt_BR",
-            "gnome-getting-started-docs-ru",
-            "gnome-shell-extension-auto-move-windows",
-            "gnome-shell-extension-dash-to-dock",
-            "gnome-shell-extension-drive-menu",
-            "gnome-shell-extension-native-window-placement",
-            "gnome-shell-extension-no-hot-corner",
-            "gnome-shell-extension-panel-favorites",
-            "gnome-shell-extension-screenshot-window-sizer",
-            "gnome-shell-extension-systemMonitor",
-            "gnome-shell-extension-top-icons",
-            "gnome-shell-extension-updates-dialog",
-            "gnome-shell-extension-user-theme",
-            "gnome-shell-extension-windowsNavigator",
-            "gnome-shell-extension-workspace-indicator",
+            "dotnet5.0",
+            "gcc-toolset-10-dyninst-devel",
             "gnome-software-editor",
-            "gnome-tweaks",
-            "gstreamer1-plugins-good-gtk",
-            "highlight-gui",
-            "hplip-gui",
-            "hwloc-gui",
-            "libproxy-gnome",
-            "lshw-gui",
-            "mdevctl",
-            "mpg123-plugins-pulseaudio",
-            "pipewire-devel",
             "pipewire-docs",
-            "pipewire-utils",
-            "policycoreutils-gui",
-            "tuned-gtk",
-            "xmlsec1-nss", 
-            "udisks2-lsm",
-            "annobin-annocheck", 
-            "net-snmp-perl", 
-            "pipewire0.2-devel",
-            "pipewire0.2-libs", 
-            "usbguard-notifier", 
-            "rsyslog-omamqp1", 
-            "fapolicyd-selinux", 
-            "thermald",
-            "python3-brotli", 
-            "nmstate-plugin-ovsdb",
-            "git-lfs",
-            "tigervnc-server-module",
-            "greenboot",
-            "greenboot-grub2",
-            "greenboot-reboot",
-            "greenboot-rpm-ostree-grub2",
-            "greenboot-status",
-            "python3-libmodulemd",
-            "dotnet5.0",
-        ]
-    }),
-
-    ("^AppStream$", {
-        "x86_64": [
-            "opae",
-            "fence-agents-lpar",
+            "rt-tests",
+            "micropipenv",
         ]
     }),
 
     ("^BaseOS$", {
         "*": [
-            "sssd-polkit-rules", 
-            "python3-debuginfo", 
-            "python3-dnf-plugin-post-transaction-actions", 
-            "python3-solv", 
-            "libxmlb", 
-            "crypto-policies-scripts",
-            "memstrack",
+            "python3-debuginfo",
         ]
     }),
     ("^BaseOS$", {