commit: 66b8e3dc0f0d56d3a154353b4363efa65850e4d1 Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> AuthorDate: Thu Oct 7 09:18:11 2021 +0000 Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> CommitDate: Thu Oct 7 09:18:11 2021 +0000 URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=66b8e3dc
Fix support for bb 3.3.0 Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org> buildbot_gentoo_ci/config/buildfactorys.py | 2 +- buildbot_gentoo_ci/steps/builders.py | 22 +++++++++++----------- buildbot_gentoo_ci/steps/portage.py | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/buildbot_gentoo_ci/config/buildfactorys.py b/buildbot_gentoo_ci/config/buildfactorys.py index 41c3171..45f8f48 100644 --- a/buildbot_gentoo_ci/config/buildfactorys.py +++ b/buildbot_gentoo_ci/config/buildfactorys.py @@ -101,7 +101,7 @@ def run_build_request(): f.addStep(builders.SetupPropertys()) # Clean and add new /etc/portage #NOTE: remove the symlink befor the dir - f.addStep(buildbot_steps.ShellCommandNewStyle( + f.addStep(buildbot_steps.ShellCommand( command=['rm', 'make.profile'], workdir='/etc/portage/' )) diff --git a/buildbot_gentoo_ci/steps/builders.py b/buildbot_gentoo_ci/steps/builders.py index 80fe52f..79be77f 100644 --- a/buildbot_gentoo_ci/steps/builders.py +++ b/buildbot_gentoo_ci/steps/builders.py @@ -375,7 +375,7 @@ class RunEmerge(BuildStep): shell_commad_list.append('--buildpkg-exclude') shell_commad_list.append('acct-*') aftersteps_list.append( - steps.SetPropertyFromCommandNewStyle( + steps.SetPropertyFromCommand( command=shell_commad_list, strip=True, extract_fn=PersOutputOfEmerge, @@ -394,7 +394,7 @@ class RunEmerge(BuildStep): shell_commad_list.append('--buildpkg-exclude') shell_commad_list.append('acct-*') aftersteps_list.append( - steps.SetPropertyFromCommandNewStyle( + steps.SetPropertyFromCommand( command=shell_commad_list, strip=True, extract_fn=PersOutputOfEmerge, @@ -409,7 +409,7 @@ class RunEmerge(BuildStep): shell_commad_list.append('-q') shell_commad_list.append('@preserved-rebuild') aftersteps_list.append( - steps.SetPropertyFromCommandNewStyle( + steps.SetPropertyFromCommand( command=shell_commad_list, strip=True, extract_fn=PersOutputOfEmerge, @@ -423,7 +423,7 @@ class RunEmerge(BuildStep): shell_commad_list.append('--pretend') shell_commad_list.append('--depclean') aftersteps_list.append( - steps.SetPropertyFromCommandNewStyle( + steps.SetPropertyFromCommand( command=shell_commad_list, strip=True, extract_fn=PersOutputOfDepclean, @@ -439,7 +439,7 @@ class RunEmerge(BuildStep): if self.getProperty('depclean'): pass aftersteps_list.append( - steps.SetPropertyFromCommandNewStyle( + steps.SetPropertyFromCommand( command=shell_commad_list, strip=True, extract_fn=PersOutputOfDepclean, @@ -468,7 +468,7 @@ class RunEmerge(BuildStep): shell_commad_list.append('--usepkg=n') shell_commad_list.append(c + '/' + p) aftersteps_list.append( - steps.SetPropertyFromCommandNewStyle( + steps.SetPropertyFromCommand( command=shell_commad_list, strip=True, extract_fn=PersOutputOfEmerge, @@ -492,7 +492,7 @@ class RunEmerge(BuildStep): shell_commad_list.append('acct-*') shell_commad_list.append('-p') aftersteps_list.append( - steps.SetPropertyFromCommandNewStyle( + steps.SetPropertyFromCommand( command=shell_commad_list, strip=True, extract_fn=PersOutputOfEmerge, @@ -517,7 +517,7 @@ class RunEmerge(BuildStep): shell_commad_list.append('--buildpkg-exclude') shell_commad_list.append('acct-*') aftersteps_list.append( - steps.SetPropertyFromCommandNewStyle( + steps.SetPropertyFromCommand( command=shell_commad_list, strip=True, extract_fn=PersOutputOfEmerge, @@ -663,7 +663,7 @@ class CheckEmergeLogs(BuildStep): shell_commad_list.append('--buildpkg-exclude') shell_commad_list.append('acct-*') self.aftersteps_list.append( - steps.SetPropertyFromCommandNewStyle( + steps.SetPropertyFromCommand( command=shell_commad_list, strip=True, extract_fn=PersOutputOfEmerge, @@ -830,7 +830,7 @@ class RunPkgCheck(BuildStep): else: pkgcheck_workdir = yield os.path.join(repository_path, c, p, '') aftersteps_list.append( - steps.SetPropertyFromCommandNewStyle( + steps.SetPropertyFromCommand( command=shell_commad_list, strip=True, extract_fn=PersOutputOfPkgCheck, @@ -891,7 +891,7 @@ class RunEmergeInfo(BuildStep): ] shell_commad_list.append('--info') aftersteps_list.append( - steps.SetPropertyFromCommandNewStyle( + steps.SetPropertyFromCommand( command=shell_commad_list, strip=True, extract_fn=PersOutputOfEmergeInfo, diff --git a/buildbot_gentoo_ci/steps/portage.py b/buildbot_gentoo_ci/steps/portage.py index 94323ba..dcbf599 100644 --- a/buildbot_gentoo_ci/steps/portage.py +++ b/buildbot_gentoo_ci/steps/portage.py @@ -105,7 +105,7 @@ class SetMakeProfile(BuildStep): shell_commad_list.append(makeprofile_path) shell_commad_list.append('/etc/portage/make.profile') yield self.build.addStepsAfterCurrentStep([ - steps.ShellCommandNewStyle( + steps.ShellCommand( command=shell_commad_list, workdir='/' )