Sync with i9.5-certified-scbs branch

msvsphere/additional_packages.conf

@@ -56,16 +56,6 @@ additional_packages = [
             ]
         }
     ),
-    (
-        '^Devel$', {
-            '*': [
-                "glibc32",
-                "sphere-repos-extra",
-                "yasm",
-                "yasm-devel"
-            ]
-        }
-    ),
     (
         '^Testing$', {
             '*': [

msvsphere/filter_packages.conf

@@ -40,22 +40,5 @@ filter_packages = [
                 "systemd-standalone-tmpfiles"
             ]
         }
-    ),
-    (
-        '^CRB$', {
-            '*': [
-                "glibc32",
-            ]
-        }
-    ),
-    (
-        '^Devel$', {
-            '*': [
-                "*.i686",
-                "gutenprint-selinux",
-                "sphere-release-el"
-            ]
-        }
     )
-
 ]

msvsphere/general.conf

@@ -1,34 +1,12 @@
 # use a remote comps.xml file from a git repository
-comps_file = {
-    'scm': 'git',
-    'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
-    'branch': 'i9.5-certified',
-    'file': 'comps.xml',
-    'command': ''
-}
-
 # alternatively, it's possible to use a local groups file
-#comps_file = 'comps.xml'
+comps_file = 'comps.xml'
 
 # use a remote variants.xml file from a git repository
-variants_file = {
-    'scm': 'git',
-    'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
-    'branch': 'i9.5-certified',
-    'file': 'variants.xml',
-    'command': ''
-}
-
 # alternatively, it's possible to use a local variants file
-#variants_file = 'variants.xml'
+variants_file = 'variants.xml'
 
 # use modulemd-defaults from a git repository
-module_defaults_dir = {
-    'scm': 'git',
-    'repo': 'http://git.inferitos.ru/msvsphere/module-defaults.git',
-    'branch': 'i9',
-    'dir': '.'
-}
 
 gather_backend = 'dnf'
 
@@ -37,11 +15,11 @@ check_deps = False
 
 gather_method = {
     # Anything that is not AppStream, CRB or Buildroot should use the old depsolver
-    "^(?!(Certified|CRB|Buildroot)).*$": {
+    "^(?!(Certified|Buildroot)).*$": {
         "comps": "deps",
         "json": "deps",
     },
-    "^(Certified|CRB|Devel|Testing)$": "hybrid",
+    "^(Certified|Testing)$": "hybrid",
 }
 
 hashed_directories = False
@@ -76,7 +54,7 @@ create_optional_isos = False
 createiso_use_xorrisofs = True
 
 createiso_skip = [
-    ("^(Certified|CRB|Devel|Testing)$", {
+    ("^(Certified|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
@@ -124,9 +102,13 @@ lorax_options = [
     })
 ]
 
+buildinstall_skip = [
+    ("^(Testing)$", {
+        '*': True
+    })
+]
+
 # LOOKASIDE
 variant_as_lookaside = [
-    ('CRB', 'Certified'),
-    ("Devel", "Certified"),
     ("Testing", "Certified")
 ]

variants.xml

@@ -83,29 +83,6 @@
       <!-- <module>maven:3.8</module> -->
     </modules>
   </variant>
-  <variant id="CRB" name="CRB" type="variant">
-    <arches>
-      <arch>x86_64</arch>
-    </arches>
-    <groups>
-      <group default="false">crb</group>
-    </groups>
-    <modules>
-      <!-- <module>swig:4.1</module> -->
-    </modules>
-  </variant>
-  <variant id="Devel" name="Devel" type="variant">
-    <arches>
-      <arch>x86_64</arch>
-    </arches>
-    <groups>
-      <group default="false">additional-devel</group>
-    </groups>
-    <modules>
-      <!-- <module>javapackages-tools-devel:202201</module> -->
-      <!-- <module>javapackages-tools:202201</module> -->
-    </modules>
-  </variant>
   <variant id="Testing" name="Testing" type="variant">
     <arches>
       <arch>x86_64</arch>