Skip to content

Commit 2562626

Browse files
ravanellijlebon
authored andcommitted
cmd-koji-upload: Move variable setup to Build class initializer
- Refactored the code to centralize variable definitions and method calls into the Build class __init__ method. This improves readability and avoids scattered variable access throughout the logic. Signed-off-by: Renata Ravanelli <[email protected]>
1 parent 9bc0fec commit 2562626

File tree

1 file changed

+16
-20
lines changed

1 file changed

+16
-20
lines changed

src/cmd-koji-upload

+16-20
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,11 @@ class Build(_Build):
112112
"require_cosa": True,
113113
})
114114
_Build.__init__(self, **kwargs)
115-
115+
self.version, self.release = self.build_id.split('-')
116+
self.name = f"{self.build_name}-{self.basearch}"
117+
self.source = self.get_meta_key(
118+
"meta", self.ckey("container-config-git"))
119+
self.host_rpms = self.get_rpm_list('host')
116120
def __del__(self):
117121
try:
118122
shutil.rmtree(self._tmpdir)
@@ -502,11 +506,10 @@ class Reserve(_KojiBase):
502506
# Version = 414.92.202307170903
503507
# Release = 0
504508
# NVR = rhcos-x86_64-414.92.202307170903-0
505-
version, release = build.build_id.split('-')
506509
data = {
507-
"name": f"{build.build_name}-{build.basearch}",
508-
"release": release,
509-
"version": version,
510+
"name": build.name,
511+
"release": build.release,
512+
"version": build.version,
510513
"cg": "coreos-assembler",
511514
}
512515

@@ -528,7 +531,7 @@ class Reserve(_KojiBase):
528531
build.meta['koji'] = {
529532
'build_id': koji_reservation['build_id'],
530533
'token': koji_reservation['token'],
531-
'release': release
534+
'release': build.release
532535
}
533536
build.meta_write()
534537

@@ -707,8 +710,6 @@ class Upload(_KojiBase):
707710
}
708711
self.build.meta_write()
709712

710-
source = self.build.get_meta_key(
711-
"meta", self.build.ckey("container-config-git"))
712713

713714
log.debug(f"Preparing manifest for {(len(self.image_files))} files")
714715
# The koji/brew NVR is constructed like so:
@@ -721,7 +722,6 @@ class Upload(_KojiBase):
721722
# Version = 414.92.202307170903
722723
# Release = 0
723724
# NVR = rhcos-x86_64-414.92.202307170903-0
724-
version, release = self.build.build_id.split('-')
725725
self._manifest = {
726726
"metadata_version": 0,
727727
"build": {
@@ -734,12 +734,12 @@ class Upload(_KojiBase):
734734
}
735735
}
736736
},
737-
"name": f"{self.build.build_name}-{self.build.basearch}",
738-
"release": release,
737+
"name": self.build.name,
738+
"release": self.build.release,
739739
"owner": self._owner,
740-
"source": source['origin'],
740+
"source": self.build.source['origin'],
741741
"start_time": stamp,
742-
"version": version
742+
"version": self.build.version
743743
},
744744
"buildroots": [{
745745
"id": 1,
@@ -749,16 +749,14 @@ class Upload(_KojiBase):
749749
},
750750
"content_generator": {
751751
"name": "coreos-assembler",
752-
"version": self.build.get_sub_obj(
753-
"meta",
754-
self.build.ckey("container-config-git"), "commit")
752+
"version": self.build.source['commit']
755753
},
756754
"container": {
757755
"type": "docker",
758756
"arch": self.build.basearch,
759757
"name": "coreos-assembler"
760758
},
761-
"components": self.build.get_rpm_list('host'),
759+
"components": self.build.host_rpms,
762760
"extra": {
763761
"coreos-assembler": {
764762
"build_id": 1,
@@ -769,9 +767,7 @@ class Upload(_KojiBase):
769767
"tools": [
770768
{
771769
"name": "coreos-assembler",
772-
"version": self.build.get_sub_obj(
773-
"meta",
774-
self.build.ckey("container-config-git"), "commit")
770+
"version": self.build.source['commit']
775771
}
776772
]
777773
}],

0 commit comments

Comments
 (0)