From 07f9d4df7a200484263557efc3d89b39f392c88f Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Jul 31 2024 21:26:53 +0000
Subject: Drop modularity and ix86


---

diff --git a/shared/extra_isos.conf b/shared/extra_isos.conf
index 4c544e8..c044665 100644
--- a/shared/extra_isos.conf
+++ b/shared/extra_isos.conf
@@ -8,6 +8,6 @@ extra_isos = {
         "extra_files": EXTRA_FILES,
         "arches": EXTRA_ISOS_ARCHES,
         # Make extra_isos failable until we have working installer.
-        "failable_arches": ['aarch64', 'ppc64le', 's390x', 'x86_64', 'i386']
+        "failable_arches": ['aarch64', 'ppc64le', 's390x', 'x86_64']
     }]
 }
diff --git a/shared/general.conf b/shared/general.conf
index f46d24e..3396f64 100644
--- a/shared/general.conf
+++ b/shared/general.conf
@@ -21,13 +21,6 @@ comps_file = {
     'command': COMPS_COMMAND
 }
 
-module_defaults_dir = {
-    'scm': 'git',
-    'repo': MODULE_DEFAULTS_REPO,
-    'branch': MODULE_DEFAULTS_BRANCH,
-    'dir': '.'
-}
-
 variants_file = {
     "scm": "git",
     "repo": VARIANTS_REPO,
diff --git a/shared/pkgset.conf b/shared/pkgset.conf
index 020eb87..54bb236 100644
--- a/shared/pkgset.conf
+++ b/shared/pkgset.conf
@@ -1,5 +1,5 @@
 pkgset_source = "koji"
 pkgset_koji_tag = PKGSET_KOJI_TAG
-pkgset_koji_module_tag = PKGSET_KOJI_MODULE_TAG
+pkgset_koji_module_tag = ""
 
 pkgset_inherit_exclusive_arch_to_noarch = False
diff --git a/shared/variables.conf b/shared/variables.conf
index 54f9f6a..6e648ae 100644
--- a/shared/variables.conf
+++ b/shared/variables.conf
@@ -2,7 +2,6 @@ global RELEASE_NAME
 global RELEASE_SHORT
 global RELEASE_VERSION
 global PKGSET_KOJI_TAG
-global PKGSET_KOJI_MODULE_TAG
 global RUNROOT_CHANNEL
 global RUNROOT_TAG
 global RELEASE_VERSION
@@ -15,8 +14,6 @@ global COMPS_REPO
 global COMPS_BRANCH
 global COMPS_FILE
 global COMPS_COMMAND
-global MODULE_DEFAULTS_REPO
-global MODULE_DEFAULTS_BRANCH
 global VARIANTS_REPO
 global VARIANTS_BRANCH
 global VARIANTS_FILE