From 70e38d061e74ab0d75248afa80fea27e8de1de83 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Fri, 10 Jan 2025 10:15:48 +0300
Subject: [PATCH] Drop ResilientStorage variant

---
 msvsphere/general.conf |  8 +++-----
 variants.xml           | 14 +++-----------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/msvsphere/general.conf b/msvsphere/general.conf
index 75ed900..cce56b5 100644
--- a/msvsphere/general.conf
+++ b/msvsphere/general.conf
@@ -33,7 +33,7 @@ gather_method = {
         "comps": "deps",
         "json": "deps",
     },
-    "^(AppStream|CRB|Devel|HighAvailability|Hosting|HostingTesting|KernelExtra|NFV|ResilientStorage|RT|Minimal|Server|Extras)$": "hybrid",
+    "^(AppStream|CRB|Devel|HighAvailability|Hosting|HostingTesting|KernelExtra|NFV|RT|Minimal|Server|Extras)$": "hybrid",
 }
 
 hashed_directories = False
@@ -68,7 +68,7 @@ create_optional_isos = False
 createiso_use_xorrisofs = True
 
 createiso_skip = [
-    ("^(BaseOS|AppStream|CRB|Devel|Hosting|HostingTesting|HighAvailability|KernelExtra|NFV|ResilientStorage|RT|Minimal|Server|Extras|Testing)$", {
+    ("^(BaseOS|AppStream|CRB|Devel|Hosting|HostingTesting|HighAvailability|KernelExtra|NFV|RT|Minimal|Server|Extras|Testing)$", {
         # No binary ISOs for BaseOS (but still generate src ISOs) - RCM-41330
         # No binary ISOs for AppStream (but still generate src ISOs) - RCM-40356
         # No binary or src ISOs for CRB
@@ -118,7 +118,7 @@ lorax_options = [
 ]
 
 buildinstall_skip = [
-    ("^(AppStream|CRB|Devel|Extras|HighAvailability|Hosting|HostingTesting|KernelExtra|NFV|ResilientStorage|RT|Testing)$", {
+    ("^(AppStream|CRB|Devel|Extras|HighAvailability|Hosting|HostingTesting|KernelExtra|NFV|RT|Testing)$", {
         '*': True
     })
 ]
@@ -139,8 +139,6 @@ variant_as_lookaside = [
     ("Devel", "Extras"),
     ("Extras", "BaseOS"),
     ("Extras", "AppStream"),
-    ("ResilientStorage", "BaseOS"),
-    ("ResilientStorage", "AppStream"),
     ("HostingTesting", "BaseOS"),
     ("HostingTesting", "AppStream"),
     ("Hosting", "BaseOS"),
diff --git a/variants.xml b/variants.xml
index dbd794b..de6ae7d 100644
--- a/variants.xml
+++ b/variants.xml
@@ -301,7 +301,7 @@
       <group default="false">additional-devel</group>
     </groups>
   </variant>
-<variant id="HostingTesting" name="HostingTesting" type="variant">
+  <variant id="HostingTesting" name="HostingTesting" type="variant">
     <arches>
       <arch>x86_64</arch>
 	</arches>
@@ -309,7 +309,7 @@
       <group default="false">additional-devel</group>
     </groups>
   </variant>
-<variant id="Hosting" name="Hosting" type="variant">
+  <variant id="Hosting" name="Hosting" type="variant">
     <arches>
       <arch>x86_64</arch>
 	</arches>
@@ -317,15 +317,7 @@
       <group default="false">additional-devel</group>
     </groups>
   </variant>
-<variant id="ResilientStorage" name="ResilientStorage" type="variant">
-    <arches>
-      <arch>x86_64</arch>
-	</arches>
-    <groups>
-      <group default="false">additional-devel</group>
-    </groups>
-  </variant>
-<variant id="Testing" name="Testing" type="variant">
+  <variant id="Testing" name="Testing" type="variant">
     <arches>
       <arch>x86_64</arch>
 	</arches>