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 @@
additional-devel
-
+
x86_64
@@ -309,7 +309,7 @@
additional-devel
-
+
x86_64
@@ -317,15 +317,7 @@
additional-devel
-
-
- x86_64
-
-
- additional-devel
-
-
-
+
x86_64