diff options
Diffstat (limited to 'buildbot_gentoo_ci/config/buildfactorys.py')
| -rw-r--r-- | buildbot_gentoo_ci/config/buildfactorys.py | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/buildbot_gentoo_ci/config/buildfactorys.py b/buildbot_gentoo_ci/config/buildfactorys.py index 6755308..ab80e19 100644 --- a/buildbot_gentoo_ci/config/buildfactorys.py +++ b/buildbot_gentoo_ci/config/buildfactorys.py @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 from buildbot.plugins import steps as buildbot_steps @@ -105,32 +105,13 @@ def run_build_request(): # update the repositorys listed in project_repository f.addStep(repos.UpdateRepos()) # Clean and add new /etc/portage - #NOTE: remove the symlink befor the dir - #f.addStep(buildbot_steps.ShellCommand( - # flunkOnFailure=False, - # name='Clean make.profile', - # command=['rm', 'make.profile'], - # workdir='/etc/portage/' - # )) - if buildbot_steps.FileExists(file='portage/make.conf', workdir='/etc/', haltOnFailure = False): - f.addStep(buildbot_steps.ShellCommand( + f.addStep(buildbot_steps.ShellCommand( flunkOnFailure=False, name='Remove portage dir', command=['rm', '-R', 'portage'], workdir='/etc/' )) - f.addStep(buildbot_steps.ShellCommand( - flunkOnFailure=False, - name='Create portage dir', - command=['mkdir', 'portage'], - workdir='/etc/' - )) - #f.addStep(buildbot_steps.RemoveDirectory(dir="portage", - # name='Remove portage dir', - # workdir='/etc/')) - #f.addStep(buildbot_steps.MakeDirectory(dir="portage", - # name = 'Create the portage dir', - # workdir='/etc/')) + f.addStep(portage.SetPortageSettings()) # Clean /var/cache/portage/logs and emerge.log f.addStep(buildbot_steps.ShellCommand( flunkOnFailure=False, @@ -153,13 +134,13 @@ def run_build_request(): # setup repos.conf dir #f.addStep(buildbot_steps.MakeDirectory(dir="repos.conf", # workdir='/etc/portage/')) - f.addStep(portage.SetReposConf()) + #f.addStep(portage.SetReposConf()) # setup make.conf - f.addStep(portage.SetMakeConf()) + f.addStep(portage.SetHostConf()) # setup env - f.addStep(portage.SetEnvDefault()) + #f.addStep(portage.SetEnvDefault()) # setup package.* - f.addStep(portage.SetPackageDefault()) + #f.addStep(portage.SetPackageDefault()) # setup files in /etc if needed # run --regen if needed on repo # check cpv match |