From 89be950457b1ffebe2ba2a27e0b6dc7f455e3115 Mon Sep 17 00:00:00 2001 From: Magnus Granberg Date: Sun, 4 Jun 2023 22:50:42 +0200 Subject: Add fetchonly step but not on yet Signed-off-by: Magnus Granberg --- buildbot_gentoo_ci/steps/builders.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/buildbot_gentoo_ci/steps/builders.py b/buildbot_gentoo_ci/steps/builders.py index 8692813..a5638b5 100644 --- a/buildbot_gentoo_ci/steps/builders.py +++ b/buildbot_gentoo_ci/steps/builders.py @@ -564,6 +564,34 @@ class RunEmerge(BuildStep): )) aftersteps_list.append(CheckEmergeLogs('pre-build')) + if self.step == 'fetchonly': + if projects_emerge_options['oneshot']: + shell_commad_list.append('-1') + shell_commad_list.append('-f') + #shell_commad_list.append('--quiet=n') + shell_commad_list.append('=' + self.getProperty('cpv')) + # we don't use the bin for the requsted cpv + shell_commad_list.append('--usepkg-exclude') + shell_commad_list.append(cp) + # don't build bin for virtual and acct-* + shell_commad_list.append('--buildpkg-exclude') + shell_commad_list.append('virtual') + shell_commad_list.append('--buildpkg-exclude') + shell_commad_list.append('acct-*') + aftersteps_list.append( + steps.ShellCommand( + warnOnWarnings = True, + warnOnFailure = True, + flunkOnFailure = False, + flunkOnWarnings = False, + name = self.stepname, + command=shell_commad_list, + #strip=True, + #extract_fn=PersOutputOfEmerge, + workdir='/', + timeout=self.build_timeout + )) + if self.step == 'build': if projects_emerge_options['oneshot']: shell_commad_list.append('-1') @@ -787,6 +815,7 @@ class CheckEmergeLogs(BuildStep): self.addFileUploade(sourcefile, destfile, name, url, urlText) # get elogs self.getElogFiles(cpv) + #FIXME: add etc/portage dir to upload @defer.inlineCallbacks def getBuildWorkDirs(self, cpv): @@ -1223,6 +1252,7 @@ class RunBuild(BuildStep): aftersteps_list = [] aftersteps_list.append(RunEmerge(step='pre-build')) aftersteps_list.append(RunEmergeInfo()) + #aftersteps_list.append(RunEmerge(step='fetchonly')) aftersteps_list.append(RunEmerge(step='build')) aftersteps_list.append(RunEmerge(step='pre-depclean')) aftersteps_list.append(RunEmerge(step='preserved-libs')) -- cgit v1.2.3-65-gdbad