diff --git a/msvsphere-aarch64/general.conf b/msvsphere-aarch64/general.conf
index 0e9ae6a..699d463 100644
--- a/msvsphere-aarch64/general.conf
+++ b/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"),
diff --git a/msvsphere/general.conf b/msvsphere/general.conf
index dc72af5..f247b20 100644
--- a/msvsphere/general.conf
+++ b/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"),
diff --git a/variants-aarch64.xml b/variants-aarch64.xml
index 4a879b0..296ee79 100644
--- a/variants-aarch64.xml
+++ b/variants-aarch64.xml
@@ -195,11 +195,6 @@
aarch64
-
-
- aarch64
-
-
aarch64
diff --git a/variants.xml b/variants.xml
index 4daa749..b75186d 100644
--- a/variants.xml
+++ b/variants.xml
@@ -290,15 +290,6 @@
additional-devel
-
-
- x86_64
-
-
- ha
- ha-devel
-
-
x86_64