From f54777b470515493aeb9142ae57579e5797a699f Mon Sep 17 00:00:00 2001
From: nazunalika <tucklesepk@gmail.com>
Date: Thu, 28 Apr 2022 00:43:49 -0700
Subject: [PATCH] Add NFV as a default pungi repo with backported ovs

---
 common/include-excludes.conf | 13 ++++++++++++-
 r8.conf                      |  8 ++++----
 variants.xml                 | 13 +++++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/common/include-excludes.conf b/common/include-excludes.conf
index f594a30..62af1ab 100644
--- a/common/include-excludes.conf
+++ b/common/include-excludes.conf
@@ -1,5 +1,5 @@
 filter_packages = [
-    ("^(BaseOS|AppStream|HighAvailability|ResilientStorage|RT)$", {
+    ("^(BaseOS|AppStream|HighAvailability|ResilientStorage|RT|NFV)$", {
         "*": [
             "python36",  # RCM-42305 - ursine python36 should be only in buildroot
             "gcc-toolset-9-*-testsuite", #RCM-58061
@@ -1241,6 +1241,17 @@ additional_packages = [
         ]
     }),
 
+    ("^NFV$", {
+        "*": [
+            "ovn-2021",
+            "ovn2.13",
+            "openvswitch2.13",
+            "openvswitch2.15",
+            "openvswitch2.16",
+            "openvswitch-selinux-extra-policy",
+        ]
+     }),
+
     ("^BaseOS$", {
         "*": [
 	    "rocky-obsolete-packages",
diff --git a/r8.conf b/r8.conf
index ca55da8..6df76b9 100644
--- a/r8.conf
+++ b/r8.conf
@@ -104,7 +104,7 @@ lorax_options = [
 ]
 
 buildinstall_skip = [
-    ("^(AppStream|PowerTools|HighAvailability|ResilientStorage|RT)$", {
+    ("^(AppStream|PowerTools|HighAvailability|ResilientStorage|RT|NFV)$", {
        "*": True
        }),
 ]
@@ -121,7 +121,7 @@ image_volid_formats = [ '{release_short}-8.6-{arch}-{disc_type}', ]
 create_optional_isos = False
 
 createiso_skip = [
-    ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage|RT)$', {
+    ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage|RT|NFV)$', {
         '*': True,
         'src':True
     }),
@@ -154,8 +154,8 @@ variant_as_lookaside = [
     ("ResilientStorage", "AppStream"),
     ("RT", "BaseOS"),
     ("RT", "AppStream"),
-#    ("NFV", "BaseOS"),
-#    ("NFV", "AppStream"),
+    ("NFV", "BaseOS"),
+    ("NFV", "AppStream"),
 ]
 
 extra_files = [
diff --git a/variants.xml b/variants.xml
index 9f8a3f1..7360c92 100644
--- a/variants.xml
+++ b/variants.xml
@@ -307,6 +307,19 @@
     </groups>
   </variant>
 
+  <variant id="NFV" name="NFV" type="variant">
+    <arches>
+      <arch>x86_64</arch>
+      <arch>aarch64</arch>
+    </arches>
+    <groups>
+      <group default="true">rt</group>
+      <group default="true">rt-debug</group>
+      <group default="true">nfv</group>
+      <group default="true">nfv-debug</group>
+    </groups>
+  </variant>
+
   <!-- Live Variants, loosely borrowed from Fedora
        Usually these variants are set to always be empty -->
   <variant id="Workstation" name="Workstation" type="variant" is_empty="true">