From 76b131b61cd6756bf534f0861a97fc25b0ad7c22 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Aug 31 2023 14:05:37 +0000
Subject: Drop references to Modularity


Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

---

diff --git a/fedora/variables.conf b/fedora/variables.conf
index a58f613..20fc31c 100644
--- a/fedora/variables.conf
+++ b/fedora/variables.conf
@@ -12,10 +12,6 @@ COMPS_FILE = "comps-eln.xml"
 COMPS_COMMAND = "make comps-eln.xml"
 
 
-MODULE_DEFAULTS_REPO = "https://pagure.io/releng/fedora-module-defaults.git"
-MODULE_DEFAULTS_BRANCH = "eln"
-
-
 VARIANTS_REPO = "https://pagure.io/pungi-fedora.git"
 VARIANTS_BRANCH = "eln"
 VARIANTS_FILE = "variants.xml"
@@ -34,7 +30,6 @@ RUNROOT_TAG = "eln-build"
 
 
 PKGSET_KOJI_TAG = "eln"
-PKGSET_KOJI_MODULE_TAG = "eln-modular"
 
 EXTRA_ISOS_ARCHES = ["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..c91d9d5 100644
--- a/shared/pkgset.conf
+++ b/shared/pkgset.conf
@@ -1,5 +1,4 @@
 pkgset_source = "koji"
 pkgset_koji_tag = PKGSET_KOJI_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
diff --git a/variants.xml b/variants.xml
index ed763df..450cb76 100644
--- a/variants.xml
+++ b/variants.xml
@@ -163,9 +163,6 @@
             <environment display_order="1">graphical-server-environment</environment>
             <environment display_order="4">workstation-product-environment</environment>
         </environments>
-        <modules>
-		<!--            <module>container-tools:latest</module> -->
-        </modules>
     </variant>
     <variant id="CRB" name="CodeReady Builder" type="variant">
         <arches>
@@ -178,8 +175,6 @@
         <groups>
             <group default="true">crb</group>
         </groups>
-	<modules>
-        </modules>
     </variant>