@@ -112,7 +112,11 @@ class Build(_Build):
112
112
"require_cosa" : True ,
113
113
})
114
114
_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' )
116
120
def __del__ (self ):
117
121
try :
118
122
shutil .rmtree (self ._tmpdir )
@@ -502,11 +506,10 @@ class Reserve(_KojiBase):
502
506
# Version = 414.92.202307170903
503
507
# Release = 0
504
508
# NVR = rhcos-x86_64-414.92.202307170903-0
505
- version , release = build .build_id .split ('-' )
506
509
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 ,
510
513
"cg" : "coreos-assembler" ,
511
514
}
512
515
@@ -528,7 +531,7 @@ class Reserve(_KojiBase):
528
531
build .meta ['koji' ] = {
529
532
'build_id' : koji_reservation ['build_id' ],
530
533
'token' : koji_reservation ['token' ],
531
- 'release' : release
534
+ 'release' : build . release
532
535
}
533
536
build .meta_write ()
534
537
@@ -707,8 +710,6 @@ class Upload(_KojiBase):
707
710
}
708
711
self .build .meta_write ()
709
712
710
- source = self .build .get_meta_key (
711
- "meta" , self .build .ckey ("container-config-git" ))
712
713
713
714
log .debug (f"Preparing manifest for { (len (self .image_files ))} files" )
714
715
# The koji/brew NVR is constructed like so:
@@ -721,7 +722,6 @@ class Upload(_KojiBase):
721
722
# Version = 414.92.202307170903
722
723
# Release = 0
723
724
# NVR = rhcos-x86_64-414.92.202307170903-0
724
- version , release = self .build .build_id .split ('-' )
725
725
self ._manifest = {
726
726
"metadata_version" : 0 ,
727
727
"build" : {
@@ -734,12 +734,12 @@ class Upload(_KojiBase):
734
734
}
735
735
}
736
736
},
737
- "name" : f" { self .build .build_name } - { self . build . basearch } " ,
738
- "release" : release ,
737
+ "name" : self .build .name ,
738
+ "release" : self . build . release ,
739
739
"owner" : self ._owner ,
740
- "source" : source ['origin' ],
740
+ "source" : self . build . source ['origin' ],
741
741
"start_time" : stamp ,
742
- "version" : version
742
+ "version" : self . build . version
743
743
},
744
744
"buildroots" : [{
745
745
"id" : 1 ,
@@ -749,16 +749,14 @@ class Upload(_KojiBase):
749
749
},
750
750
"content_generator" : {
751
751
"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' ]
755
753
},
756
754
"container" : {
757
755
"type" : "docker" ,
758
756
"arch" : self .build .basearch ,
759
757
"name" : "coreos-assembler"
760
758
},
761
- "components" : self .build .get_rpm_list ( 'host' ) ,
759
+ "components" : self .build .host_rpms ,
762
760
"extra" : {
763
761
"coreos-assembler" : {
764
762
"build_id" : 1 ,
@@ -769,9 +767,7 @@ class Upload(_KojiBase):
769
767
"tools" : [
770
768
{
771
769
"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' ]
775
771
}
776
772
]
777
773
}],
0 commit comments