From 1e3f1363e1ddee26937545f1b9988efcb85ff9f9 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: May 26 2022 15:54:11 +0000
Subject: Drop remaining refs to Everything


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

---

diff --git a/fedora/override.conf b/fedora/override.conf
index 76fde82..f685ec1 100644
--- a/fedora/override.conf
+++ b/fedora/override.conf
@@ -92,28 +92,6 @@ translate_paths = [ # required by image-build
 ]
 
 image_build = {
-    '^Everything$': [
-        {
-            'image-build': {
-                    'format': [('docker', 'tar.xz')],
-                    'name': 'Fedora-Container-Base',
-                    'kickstart': 'fedora-eln-container-base.ks',
-                    'distro': 'Fedora-22',
-                    'disk_size': 10,
-                    'repo': 'Everything',
-                    'install_tree_from': 'Everything',
-                    'subvariant': 'Container_Base',
-                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
-                    'failable': ['*'],
-                    },
-            'factory-parameters': {
-                'dockerversion': "1.10.1",
-                'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=elncontainer", "FGC=eln", "container=oci" ]',
-                'docker_label': '{ "name": "fedora-eln", "license": "MIT", "vendor": "Fedora Project", "version": "9"}',
-            },
-        },
-    ],
     "^BaseOS$": [
         {
             "image-build": {
@@ -126,7 +104,7 @@ image_build = {
                 "disk-size": "10",
                 "arches": ["x86_64"],
                 'install_tree_from': 'BaseOS',
-                "repo": ["BaseOS","AppStream","Everything"]
+                "repo": ["BaseOS","AppStream","CRB"]
                 "failable": ["*"],
             },
             "factory-parameters": {
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 2a0ec2f..20300c0 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -40,12 +40,6 @@ filter_packages = [
 
 
 additional_packages = [
-    # Everything contains everything.
-    ('^Everything$', {
-        '*': [
-            '*',
-        ],
-    }),
     ("^BaseOS$", {
         "*": [
             "NetworkManager-initscripts-updown", #ENGCMP-1991
diff --git a/shared/buildinstall.conf b/shared/buildinstall.conf
index 6ab450a..b6d5798 100644
--- a/shared/buildinstall.conf
+++ b/shared/buildinstall.conf
@@ -12,9 +12,6 @@ lorax_options = [
 
 buildinstall_skip = [
     EXTRA_BUILDINSTALL_SKIP,
-    ('^Everything$', {
-        'i386': True,
-    }),
     ("^(AppStream|CRB|ResilientStorage|HighAvailability|SAP|SAPHANA|RT|NFV|Extras)$", {
         '*': True
     }),
@@ -29,4 +26,3 @@ image_name_format = {
 
 buildinstall_use_guestmount = True
 buildinstall_allow_reuse = True
-