modules/module-build-service-rpm
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/module-build-service.git synced 2026-11-03 14:43:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tag the untagged artifacts when returning their build_id

Browse Source
This commit is contained in:
Jan Kaluza
2017-06-05 10:57:13 +02:00
parent 23549595d9
commit fe51ec6e60
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mbs-koji-find-untagged.patch
View File

@@ -1,5 +1,5 @@
diff --git a/module_build_service/builder/KojiModuleBuilder.py b/module_build_service/builder/KojiModuleBuilder.py
index eede0ab..9565237 100644
index eede0ab..382d2ea 100644
--- a/module_build_service/builder/KojiModuleBuilder.py
+++ b/module_build_service/builder/KojiModuleBuilder.py
@@ -67,6 +67,7 @@ class KojiModuleBuilder(GenericBuilder):
@@ -30,7 +30,7 @@ index eede0ab..9565237 100644
"""
# yaml file can hold only one reference to a package name, so
# I expect that we can have only one build of package within single module
@@ -404,6 +405,20 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
@@ -404,6 +405,21 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
assert len(tagged) == 1, "Expected exactly one item in list. Got %s" % tagged
return tagged[0]
@@ -46,12 +46,13 @@ index eede0ab..9565237 100644
+ if not build_info:
+ log.error("Cannot get build info of build %r", build['id'])
+ return None
+ self.tag_artifacts([build_info["nvr"]])
+ return build_info
+
return None
def build(self, artifact_name, source):
@@ -436,7 +451,7 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
@@ -436,7 +452,7 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
raise RuntimeError("Buildroot is not prep-ed")
# Skip existing builds

5
module-build-service.spec
View File

@@ -1,6 +1,6 @@
Name: module-build-service
Version: 1.3.23
Release: 3%{?dist}
Release: 4%{?dist}
Summary: The Module Build Service for Modularity
@@ -179,6 +179,9 @@ done
%changelog
* Mon Jun 05 2017 Jan Kaluza <jkaluza@redhat.com> - 1.3.23-4
- Tag the untagged artifacts when returning their build_id
* Mon Jun 05 2017 Jan Kaluza <jkaluza@redhat.com> - 1.3.23-3
- correct the patch from previous commit