modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-02-03 05:03:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #1771 Small fixes for MockModuleBuilder

Browse Source
This commit is contained in:
Brendan Reilly
2023-03-16 13:19:49 +00:00
parent 710e610850 433ddce11c
commit d7e58e095f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
module_build_service/builder/MockModuleBuilder.py
View File

@@ -479,7 +479,7 @@ class MockModuleBuilder(GenericBuilder):
"$root", "%s-%s" % (self.tag_name, str(threading.current_thread().name)))
config = config.replace("$arch", self.arch)
config = config.replace("$group", " ".join(self.groups))
config = config.replace("$yum_conf", self.yum_conf)
config = config.replace("$yum_conf", self.yum_conf.strip())
config = config.replace("$enabled_modules", str(self.enabled_modules))
config = config.replace("$releasever", str(self.releasever))
@@ -529,7 +529,7 @@ class MockModuleBuilder(GenericBuilder):
events.scheduler.add(repos_done_handler, ("fake_msg", self.tag_name + "-build"))
def tag_artifacts(self, artifacts):
def tag_artifacts(self, artifacts, dest_tag=False):
pass
def buildroot_add_repos(self, dependencies):
@@ -608,11 +608,15 @@ class MockModuleBuilder(GenericBuilder):
if os.path.exists(old_log):
os.rename(old_log, new_log)
def _purge_useless_logs(self):
def _purge_useless_logs(self, artifact_name):
"""
Remove empty or otherwise useless log files
"""
prefix = artifact_name + "-"
for logf in os.listdir(self.resultsdir):
if not logf.startswith(prefix):
continue
log_path = os.path.join(self.resultsdir, logf)
@@ -679,13 +683,13 @@ class MockModuleBuilder(GenericBuilder):
self._save_log(resultsdir, "build.log", artifact_name)
self._save_log(resultsdir, "status.log", artifact_name)
# Copy files from thread-related resultsdire to the main resultsdir.
# Copy files from thread-related resultsdir to the main resultsdir.
for name in os.listdir(resultsdir):
os.rename(os.path.join(resultsdir, name), os.path.join(self.resultsdir, name))
# Depending on the configuration settings, remove/keep useless log files
if conf.mock_purge_useless_logs:
self._purge_useless_logs()
self._purge_useless_logs(artifact_name)
# We return BUILDING state here even when we know it is already
# completed or failed, because otherwise utils.start_build_batch