From 8954987365145acf002b6f511023ed805d8e6d79 Mon Sep 17 00:00:00 2001
From: Neil Hanlon <neil@rockylinux.org>
Date: Mon, 4 Jul 2022 17:55:46 -0400
Subject: [PATCH] Remove fedora_release var, no longer needed

---
 iso/empanadas/empanadas/configs/el8.yaml       | 1 -
 iso/empanadas/empanadas/configs/el9-beta.yaml  | 1 -
 iso/empanadas/empanadas/configs/el9.yaml       | 1 -
 iso/empanadas/empanadas/configs/el9lh.yaml     | 1 -
 iso/empanadas/empanadas/scripts/build_image.py | 3 ---
 5 files changed, 7 deletions(-)

diff --git a/iso/empanadas/empanadas/configs/el8.yaml b/iso/empanadas/empanadas/configs/el8.yaml
index 8ce71c7..eb80aff 100644
--- a/iso/empanadas/empanadas/configs/el8.yaml
+++ b/iso/empanadas/empanadas/configs/el8.yaml
@@ -7,7 +7,6 @@
   minor: '6'
   profile: '8'
   bugurl: 'https://bugs.rockylinux.org'
-  fedora_release: 28
   allowed_arches:
     - x86_64
     - aarch64
diff --git a/iso/empanadas/empanadas/configs/el9-beta.yaml b/iso/empanadas/empanadas/configs/el9-beta.yaml
index 116cc45..19d6cd5 100644
--- a/iso/empanadas/empanadas/configs/el9-beta.yaml
+++ b/iso/empanadas/empanadas/configs/el9-beta.yaml
@@ -8,7 +8,6 @@
   profile: '9-beta'
   bugurl: 'https://bugs.rockylinux.org'
   checksum: 'sha256'
-  fedora_release: 34
   allowed_arches:
     - x86_64
     - aarch64
diff --git a/iso/empanadas/empanadas/configs/el9.yaml b/iso/empanadas/empanadas/configs/el9.yaml
index e63cd6e..8280d50 100644
--- a/iso/empanadas/empanadas/configs/el9.yaml
+++ b/iso/empanadas/empanadas/configs/el9.yaml
@@ -6,7 +6,6 @@
   major: '9'
   minor: '0'
   profile: '9'
-  fedora_release: 34
   bugurl: 'https://bugs.rockylinux.org'
   checksum: 'sha256'
   allowed_arches:
diff --git a/iso/empanadas/empanadas/configs/el9lh.yaml b/iso/empanadas/empanadas/configs/el9lh.yaml
index ea833f7..4176f66 100644
--- a/iso/empanadas/empanadas/configs/el9lh.yaml
+++ b/iso/empanadas/empanadas/configs/el9lh.yaml
@@ -8,7 +8,6 @@
   profile: '9-lookahead'
   bugurl: 'https://bugs.rockylinux.org'
   checksum: 'sha256'
-  fedora_release: 34
   allowed_arches:
     - x86_64
     - aarch64
diff --git a/iso/empanadas/empanadas/scripts/build_image.py b/iso/empanadas/empanadas/scripts/build_image.py
index e8b031c..adbf501 100644
--- a/iso/empanadas/empanadas/scripts/build_image.py
+++ b/iso/empanadas/empanadas/scripts/build_image.py
@@ -63,7 +63,6 @@ class ImageBuild:
     command_args: List[str] = field(factory=list)
     common_args: List[str] = field(factory=list)
     debug: bool = field(default=False)
-    fedora_release: int = field()
     image_type: str = field()
     job_template: Optional[Template] = field(init=False)
     kickstart_arg: List[str] = field(factory=list)
@@ -172,7 +171,6 @@ class ImageBuild:
         with os.fdopen(handle, "wb") as tmp:
             _template = self.template.render(
                 architecture=self.architecture.name,
-                fedora_version=self.fedora_release,
                 iso8601date=BUILDTIME.strftime("%Y%m%d"),
                 installdir="kickstart" if self.cli_args.kickstartdir else "os",
                 major=self.architecture.major,
@@ -368,7 +366,6 @@ def run():
                 architecture=Architecture.from_version(architecture, rlvars['revision']),
                 cli_args=results,
                 debug=results.debug,
-                fedora_release=rlvars['fedora_release'],
                 image_type=results.type, 
                 release=results.release if results.release else 0,
                 template=tdl_template,