aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Granberg <zorry@gentoo.org>2024-02-04 10:49:24 +0100
committerMagnus Granberg <zorry@gentoo.org>2024-02-04 10:49:24 +0100
commitaebeb68573134f1f1879b7513d5051e562dd3b1c (patch)
treeb711855617a5d06c64f1ed0ad54f9c4b479b4e24 /buildbot_gentoo_ci
parentUse settings repository for portage settings (diff)
downloadtinderbox-cluster-aebeb68573134f1f1879b7513d5051e562dd3b1c.tar.gz
tinderbox-cluster-aebeb68573134f1f1879b7513d5051e562dd3b1c.tar.bz2
tinderbox-cluster-aebeb68573134f1f1879b7513d5051e562dd3b1c.zip
Use flavor to set MAKEOPTS -j*
Signed-off-by: Magnus Granberg <zorry@gentoo.org>
Diffstat (limited to 'buildbot_gentoo_ci')
-rw-r--r--buildbot_gentoo_ci/steps/portage.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/buildbot_gentoo_ci/steps/portage.py b/buildbot_gentoo_ci/steps/portage.py
index 74a8e37..775e076 100644
--- a/buildbot_gentoo_ci/steps/portage.py
+++ b/buildbot_gentoo_ci/steps/portage.py
@@ -228,7 +228,12 @@ class SetHostConf(BuildStep):
separator2 = ' '
makeconf_list = []
log = yield self.addLog('host.conf')
- makeconf_list.append('MAKEOPTS="-j14"')
+ # set MAKEOPTS from flavor
+ worker_data = yield self.gentooci.db.workers.getWorkerByUuid(self.getProperty('workername'))
+ print('worker_data')
+ worker_flavor = yield self.gentooci.db.workers.getFlavorById(worker_data['flavor_id'])
+ print('worker_flavor')
+ makeconf_list.append('MAKEOPTS="-j' + str(worker_flavor['cpu']) + '"')
makeconf_string = separator1.join(makeconf_list)
print(makeconf_string)
yield self.build.addStepsAfterCurrentStep([