sig_core/toolkit
sig_core/toolkit
7
2
Fork 3
Code Issues 6 Pull Requests 2 Actions Projects Releases Wiki Activity

Remove fedora_release var, no longer needed

Browse Source
This commit is contained in:
Neil Hanlon 2022-07-04 17:55:46 -04:00
parent fe4daffb25
commit 8954987365
Signed by: neil
GPG Key ID: 705BC21EC3C70F34
5 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
iso/empanadas/empanadas/configs/el8.yaml
View File

@ -7,7 +7,6 @@
minor: '6' minor: '6'
profile: '8' profile: '8'
bugurl: 'https://bugs.rockylinux.org' bugurl: 'https://bugs.rockylinux.org'
fedora_release: 28
allowed_arches: allowed_arches:
- x86_64 - x86_64
- aarch64 - aarch64

1
iso/empanadas/empanadas/configs/el9-beta.yaml
View File

@ -8,7 +8,6 @@
profile: '9-beta' profile: '9-beta'
bugurl: 'https://bugs.rockylinux.org' bugurl: 'https://bugs.rockylinux.org'
checksum: 'sha256' checksum: 'sha256'
fedora_release: 34
allowed_arches: allowed_arches:
- x86_64 - x86_64
- aarch64 - aarch64

1
iso/empanadas/empanadas/configs/el9.yaml
View File

@ -6,7 +6,6 @@
major: '9' major: '9'
minor: '0' minor: '0'
profile: '9' profile: '9'
fedora_release: 34
bugurl: 'https://bugs.rockylinux.org' bugurl: 'https://bugs.rockylinux.org'
checksum: 'sha256' checksum: 'sha256'
allowed_arches: allowed_arches:

1
iso/empanadas/empanadas/configs/el9lh.yaml
View File

@ -8,7 +8,6 @@
profile: '9-lookahead' profile: '9-lookahead'
bugurl: 'https://bugs.rockylinux.org' bugurl: 'https://bugs.rockylinux.org'
checksum: 'sha256' checksum: 'sha256'
fedora_release: 34
allowed_arches: allowed_arches:
- x86_64 - x86_64
- aarch64 - aarch64

3
iso/empanadas/empanadas/scripts/build_image.py
View File

@ -63,7 +63,6 @@ class ImageBuild:
command_args: List[str] = field(factory=list) command_args: List[str] = field(factory=list)
common_args: List[str] = field(factory=list) common_args: List[str] = field(factory=list)
debug: bool = field(default=False) debug: bool = field(default=False)
fedora_release: int = field()
image_type: str = field() image_type: str = field()
job_template: Optional[Template] = field(init=False) job_template: Optional[Template] = field(init=False)
kickstart_arg: List[str] = field(factory=list) kickstart_arg: List[str] = field(factory=list)
@ -172,7 +171,6 @@ class ImageBuild:
with os.fdopen(handle, "wb") as tmp: with os.fdopen(handle, "wb") as tmp:
_template = self.template.render( _template = self.template.render(
architecture=self.architecture.name, architecture=self.architecture.name,
fedora_version=self.fedora_release,
iso8601date=BUILDTIME.strftime("%Y%m%d"), iso8601date=BUILDTIME.strftime("%Y%m%d"),
installdir="kickstart" if self.cli_args.kickstartdir else "os", installdir="kickstart" if self.cli_args.kickstartdir else "os",
major=self.architecture.major, major=self.architecture.major,
@ -368,7 +366,6 @@ def run():
architecture=Architecture.from_version(architecture, rlvars['revision']), architecture=Architecture.from_version(architecture, rlvars['revision']),
cli_args=results, cli_args=results,
debug=results.debug, debug=results.debug,
fedora_release=rlvars['fedora_release'],
image_type=results.type, image_type=results.type,
release=results.release if results.release else 0, release=results.release if results.release else 0,
template=tdl_template, template=tdl_template,