diff options
| author |   Magnus Granberg <zorry@gentoo.org> | 2022-07-26 14:59:19 +0200 |
|---|---|---|
| committer | Magnus Granberg <zorry@gentoo.org> | 2022-07-26 14:59:19 +0200 |
| commit | 8ab6bf127155a3bddca43767fb7aa208a3ea4fe7 (patch) | |
| tree | d741710ab78f7223e7fb29b02713c468cebe4014 | |
| parent | Clean up and add use of rootworkdir (diff) | |
| download | tinderbox-cluster-8ab6bf127155a3bddca43767fb7aa208a3ea4fe7.tar.gz tinderbox-cluster-8ab6bf127155a3bddca43767fb7aa208a3ea4fe7.tar.bz2 tinderbox-cluster-8ab6bf127155a3bddca43767fb7aa208a3ea4fe7.zip | |
Add support for use of rootworkdir
Signed-off-by: Magnus Granberg <zorry@gentoo.org>
| -rw-r--r-- | buildbot_gentoo_ci/steps/builders.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/buildbot_gentoo_ci/steps/builders.py b/buildbot_gentoo_ci/steps/builders.py index 38dfa79..383ae60 100644 --- a/buildbot_gentoo_ci/steps/builders.py +++ b/buildbot_gentoo_ci/steps/builders.py @@ -314,6 +314,7 @@ class SetupPropertys(BuildStep): self.gentooci = self.master.namedServices['services'].namedServices['gentooci'] print('build this %s' % self.getProperty("cpv")) self.setProperty('portage_repos_path', self.gentooci.config.project['project']['worker_portage_repos_path'], 'portage_repos_path') + self.setProperty('rootworkdir', False, 'rootworkdir') projectrepository_data = self.getProperty('projectrepository_data') print(projectrepository_data) project_data = yield self.gentooci.db.projects.getProjectByUuid(projectrepository_data['project_uuid']) @@ -342,6 +343,7 @@ class SetupPropertys(BuildStep): self.descriptionDone = ' '.join([self.getProperty("cpv"), 'for project', self.getProperty('project_data')['name']]) return SUCCESS +# Should be moved to repos.py class UpdateRepos(BuildStep): name = 'UpdateRepos' @@ -351,8 +353,7 @@ class UpdateRepos(BuildStep): haltOnFailure = True flunkOnFailure = True - def __init__(self, workdir=False, **kwargs): - self.rootworkdir = workdir + def __init__(self, **kwargs): super().__init__(**kwargs) @defer.inlineCallbacks @@ -364,8 +365,8 @@ class UpdateRepos(BuildStep): projects_repositorys_data = yield self.gentooci.db.projects.getRepositorysByProjectUuid(project_data['uuid']) for project_repository_data in projects_repositorys_data: repository_data = yield self.gentooci.db.repositorys.getRepositoryByUuid(project_repository_data['repository_uuid']) - if self.rootworkdir: - repository_path = os.path.join(self.rootworkdir, portage_repos_path[1:], repository_data['name']) + if self.getProperty('rootworkdir'): + repository_path = os.path.join(self.getProperty('rootworkdir'), portage_repos_path[1:], repository_data['name']) else: repository_path = os.path.join(portage_repos_path, repository_data['name'], '') yield self.build.addStepsAfterCurrentStep([ |