aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Granberg <zorry@gentoo.org>2023-06-04 22:50:42 +0200
committerMagnus Granberg <zorry@gentoo.org>2023-06-04 22:50:42 +0200
commit89be950457b1ffebe2ba2a27e0b6dc7f455e3115 (patch)
treecb088d2295a1c8584aa0b27a4392aa778e459799 /buildbot_gentoo_ci
parentUpdate gitlab patch to bb3.8 (diff)
downloadtinderbox-cluster-89be950457b1ffebe2ba2a27e0b6dc7f455e3115.tar.gz
tinderbox-cluster-89be950457b1ffebe2ba2a27e0b6dc7f455e3115.tar.bz2
tinderbox-cluster-89be950457b1ffebe2ba2a27e0b6dc7f455e3115.zip
Add fetchonly step but not on yet
Signed-off-by: Magnus Granberg <zorry@gentoo.org>
Diffstat (limited to 'buildbot_gentoo_ci')
-rw-r--r--buildbot_gentoo_ci/steps/builders.py30
1 files changed, 30 insertions, 0 deletions
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'))