| 1 |
commit: 66b8e3dc0f0d56d3a154353b4363efa65850e4d1 |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 7 09:18:11 2021 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 7 09:18:11 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=66b8e3dc |
| 7 |
|
| 8 |
Fix support for bb 3.3.0 |
| 9 |
|
| 10 |
Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org> |
| 11 |
|
| 12 |
buildbot_gentoo_ci/config/buildfactorys.py | 2 +- |
| 13 |
buildbot_gentoo_ci/steps/builders.py | 22 +++++++++++----------- |
| 14 |
buildbot_gentoo_ci/steps/portage.py | 2 +- |
| 15 |
3 files changed, 13 insertions(+), 13 deletions(-) |
| 16 |
|
| 17 |
diff --git a/buildbot_gentoo_ci/config/buildfactorys.py b/buildbot_gentoo_ci/config/buildfactorys.py |
| 18 |
index 41c3171..45f8f48 100644 |
| 19 |
--- a/buildbot_gentoo_ci/config/buildfactorys.py |
| 20 |
+++ b/buildbot_gentoo_ci/config/buildfactorys.py |
| 21 |
@@ -101,7 +101,7 @@ def run_build_request(): |
| 22 |
f.addStep(builders.SetupPropertys()) |
| 23 |
# Clean and add new /etc/portage |
| 24 |
#NOTE: remove the symlink befor the dir |
| 25 |
- f.addStep(buildbot_steps.ShellCommandNewStyle( |
| 26 |
+ f.addStep(buildbot_steps.ShellCommand( |
| 27 |
command=['rm', 'make.profile'], |
| 28 |
workdir='/etc/portage/' |
| 29 |
)) |
| 30 |
|
| 31 |
diff --git a/buildbot_gentoo_ci/steps/builders.py b/buildbot_gentoo_ci/steps/builders.py |
| 32 |
index 80fe52f..79be77f 100644 |
| 33 |
--- a/buildbot_gentoo_ci/steps/builders.py |
| 34 |
+++ b/buildbot_gentoo_ci/steps/builders.py |
| 35 |
@@ -375,7 +375,7 @@ class RunEmerge(BuildStep): |
| 36 |
shell_commad_list.append('--buildpkg-exclude') |
| 37 |
shell_commad_list.append('acct-*') |
| 38 |
aftersteps_list.append( |
| 39 |
- steps.SetPropertyFromCommandNewStyle( |
| 40 |
+ steps.SetPropertyFromCommand( |
| 41 |
command=shell_commad_list, |
| 42 |
strip=True, |
| 43 |
extract_fn=PersOutputOfEmerge, |
| 44 |
@@ -394,7 +394,7 @@ class RunEmerge(BuildStep): |
| 45 |
shell_commad_list.append('--buildpkg-exclude') |
| 46 |
shell_commad_list.append('acct-*') |
| 47 |
aftersteps_list.append( |
| 48 |
- steps.SetPropertyFromCommandNewStyle( |
| 49 |
+ steps.SetPropertyFromCommand( |
| 50 |
command=shell_commad_list, |
| 51 |
strip=True, |
| 52 |
extract_fn=PersOutputOfEmerge, |
| 53 |
@@ -409,7 +409,7 @@ class RunEmerge(BuildStep): |
| 54 |
shell_commad_list.append('-q') |
| 55 |
shell_commad_list.append('@preserved-rebuild') |
| 56 |
aftersteps_list.append( |
| 57 |
- steps.SetPropertyFromCommandNewStyle( |
| 58 |
+ steps.SetPropertyFromCommand( |
| 59 |
command=shell_commad_list, |
| 60 |
strip=True, |
| 61 |
extract_fn=PersOutputOfEmerge, |
| 62 |
@@ -423,7 +423,7 @@ class RunEmerge(BuildStep): |
| 63 |
shell_commad_list.append('--pretend') |
| 64 |
shell_commad_list.append('--depclean') |
| 65 |
aftersteps_list.append( |
| 66 |
- steps.SetPropertyFromCommandNewStyle( |
| 67 |
+ steps.SetPropertyFromCommand( |
| 68 |
command=shell_commad_list, |
| 69 |
strip=True, |
| 70 |
extract_fn=PersOutputOfDepclean, |
| 71 |
@@ -439,7 +439,7 @@ class RunEmerge(BuildStep): |
| 72 |
if self.getProperty('depclean'): |
| 73 |
pass |
| 74 |
aftersteps_list.append( |
| 75 |
- steps.SetPropertyFromCommandNewStyle( |
| 76 |
+ steps.SetPropertyFromCommand( |
| 77 |
command=shell_commad_list, |
| 78 |
strip=True, |
| 79 |
extract_fn=PersOutputOfDepclean, |
| 80 |
@@ -468,7 +468,7 @@ class RunEmerge(BuildStep): |
| 81 |
shell_commad_list.append('--usepkg=n') |
| 82 |
shell_commad_list.append(c + '/' + p) |
| 83 |
aftersteps_list.append( |
| 84 |
- steps.SetPropertyFromCommandNewStyle( |
| 85 |
+ steps.SetPropertyFromCommand( |
| 86 |
command=shell_commad_list, |
| 87 |
strip=True, |
| 88 |
extract_fn=PersOutputOfEmerge, |
| 89 |
@@ -492,7 +492,7 @@ class RunEmerge(BuildStep): |
| 90 |
shell_commad_list.append('acct-*') |
| 91 |
shell_commad_list.append('-p') |
| 92 |
aftersteps_list.append( |
| 93 |
- steps.SetPropertyFromCommandNewStyle( |
| 94 |
+ steps.SetPropertyFromCommand( |
| 95 |
command=shell_commad_list, |
| 96 |
strip=True, |
| 97 |
extract_fn=PersOutputOfEmerge, |
| 98 |
@@ -517,7 +517,7 @@ class RunEmerge(BuildStep): |
| 99 |
shell_commad_list.append('--buildpkg-exclude') |
| 100 |
shell_commad_list.append('acct-*') |
| 101 |
aftersteps_list.append( |
| 102 |
- steps.SetPropertyFromCommandNewStyle( |
| 103 |
+ steps.SetPropertyFromCommand( |
| 104 |
command=shell_commad_list, |
| 105 |
strip=True, |
| 106 |
extract_fn=PersOutputOfEmerge, |
| 107 |
@@ -663,7 +663,7 @@ class CheckEmergeLogs(BuildStep): |
| 108 |
shell_commad_list.append('--buildpkg-exclude') |
| 109 |
shell_commad_list.append('acct-*') |
| 110 |
self.aftersteps_list.append( |
| 111 |
- steps.SetPropertyFromCommandNewStyle( |
| 112 |
+ steps.SetPropertyFromCommand( |
| 113 |
command=shell_commad_list, |
| 114 |
strip=True, |
| 115 |
extract_fn=PersOutputOfEmerge, |
| 116 |
@@ -830,7 +830,7 @@ class RunPkgCheck(BuildStep): |
| 117 |
else: |
| 118 |
pkgcheck_workdir = yield os.path.join(repository_path, c, p, '') |
| 119 |
aftersteps_list.append( |
| 120 |
- steps.SetPropertyFromCommandNewStyle( |
| 121 |
+ steps.SetPropertyFromCommand( |
| 122 |
command=shell_commad_list, |
| 123 |
strip=True, |
| 124 |
extract_fn=PersOutputOfPkgCheck, |
| 125 |
@@ -891,7 +891,7 @@ class RunEmergeInfo(BuildStep): |
| 126 |
] |
| 127 |
shell_commad_list.append('--info') |
| 128 |
aftersteps_list.append( |
| 129 |
- steps.SetPropertyFromCommandNewStyle( |
| 130 |
+ steps.SetPropertyFromCommand( |
| 131 |
command=shell_commad_list, |
| 132 |
strip=True, |
| 133 |
extract_fn=PersOutputOfEmergeInfo, |
| 134 |
|
| 135 |
diff --git a/buildbot_gentoo_ci/steps/portage.py b/buildbot_gentoo_ci/steps/portage.py |
| 136 |
index 94323ba..dcbf599 100644 |
| 137 |
--- a/buildbot_gentoo_ci/steps/portage.py |
| 138 |
+++ b/buildbot_gentoo_ci/steps/portage.py |
| 139 |
@@ -105,7 +105,7 @@ class SetMakeProfile(BuildStep): |
| 140 |
shell_commad_list.append(makeprofile_path) |
| 141 |
shell_commad_list.append('/etc/portage/make.profile') |
| 142 |
yield self.build.addStepsAfterCurrentStep([ |
| 143 |
- steps.ShellCommandNewStyle( |
| 144 |
+ steps.ShellCommand( |
| 145 |
command=shell_commad_list, |
| 146 |
workdir='/' |
| 147 |
) |
Archives