Drop ResilientStorage variant

msvsphere-aarch64/general.conf

@@ -33,7 +33,7 @@ gather_method = {
         "comps": "deps",
         "json": "deps",
     },
-    "^(AppStream|CRB|Devel|HighAvailability|ResilientStorage|Minimal|Server|Extras|Testing)$": "hybrid",
+    "^(AppStream|CRB|Devel|HighAvailability|Minimal|Server|Extras|Testing)$": "hybrid",
 }
 
 hashed_directories = False
@@ -68,7 +68,7 @@ create_optional_isos = False
 createiso_use_xorrisofs = True
 
 createiso_skip = [
-    ("^(BaseOS|AppStream|CRB|Devel|HighAvailability|ResilientStorage|Minimal|Server|Extras|Testing)$", {
+    ("^(BaseOS|AppStream|CRB|Devel|HighAvailability|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
@@ -122,8 +122,6 @@ variant_as_lookaside = [
     ('CRB', 'AppStream'),
     ('HighAvailability', 'BaseOS'),
     ('HighAvailability', 'AppStream'),
-    ("ResilientStorage", "BaseOS"),
-    ("ResilientStorage", "AppStream"),
     ("Devel", "BaseOS"),
     ("Devel", "AppStream"),
     ("Devel", "Extras"),

msvsphere/general.conf

@@ -33,7 +33,7 @@ gather_method = {
         "comps": "deps",
         "json": "deps",
     },
-    "^(AppStream|CRB|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Testing)$": "hybrid",
+    "^(AppStream|CRB|Devel|HighAvailability|NFV|RT|Minimal|Server|Extras|Testing)$": "hybrid",
 }
 
 hashed_directories = False
@@ -68,7 +68,7 @@ create_optional_isos = False
 createiso_use_xorrisofs = True
 
 createiso_skip = [
-    ("^(BaseOS|AppStream|CRB|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Testing)$", {
+    ("^(BaseOS|AppStream|CRB|Devel|HighAvailability|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
@@ -123,8 +123,6 @@ variant_as_lookaside = [
     ('CRB', 'AppStream'),
     ('HighAvailability', 'BaseOS'),
     ('HighAvailability', 'AppStream'),
-    ("ResilientStorage", "BaseOS"),
-    ("ResilientStorage", "AppStream"),
     ("RT", "BaseOS"),
     ("RT", "AppStream"),
     ("NFV", "BaseOS"),

variants-aarch64.xml

@@ -195,11 +195,6 @@
       <arch>aarch64</arch>
     </arches>
   </variant>
-  <variant id="ResilientStorage" name="ResilientStorage" type="variant">
-    <arches>
-      <arch>aarch64</arch>
-    </arches>
-  </variant>
   <variant id="Testing" name="Testing" type="variant">
     <arches>
       <arch>aarch64</arch>

variants.xml

@@ -290,15 +290,6 @@
       <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">ha</group>
-      <group default="false">ha-devel</group>
-    </groups>
-  </variant>
   <variant id="Testing" name="Testing" type="variant">
     <arches>
       <arch>x86_64</arch>