| 1 |
commit: c71f1b00885a6bd3851182ebc27d5eea67351cbc |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 28 21:41:07 2023 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 28 21:41:07 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=c71f1b00 |
| 7 |
|
| 8 |
Add eclean to building steps |
| 9 |
|
| 10 |
Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org> |
| 11 |
|
| 12 |
buildbot_gentoo_ci/steps/builders.py | 29 +++++++++++++++++++++++++++++ |
| 13 |
1 file changed, 29 insertions(+) |
| 14 |
|
| 15 |
diff --git a/buildbot_gentoo_ci/steps/builders.py b/buildbot_gentoo_ci/steps/builders.py |
| 16 |
index 1746122..a3f82a3 100644 |
| 17 |
--- a/buildbot_gentoo_ci/steps/builders.py |
| 18 |
+++ b/buildbot_gentoo_ci/steps/builders.py |
| 19 |
@@ -490,6 +490,34 @@ class RunEmerge(BuildStep): |
| 20 |
)) |
| 21 |
aftersteps_list.append(CheckDepcleanLogs('depclean')) |
| 22 |
|
| 23 |
+ # Run eclean on Packages and Distfiles |
| 24 |
+ #FIXME: cleantime set in config |
| 25 |
+ cleantime_package = '3w' |
| 26 |
+ cleantime_distfiles = '2d' |
| 27 |
+ if self.step == 'eclean': |
| 28 |
+ aftersteps_list.append( |
| 29 |
+ steps.ShellCommand( |
| 30 |
+ flunkOnFailure=False, |
| 31 |
+ name = 'Run eclean Packages', |
| 32 |
+ command=['eclean-pkg', '-Ct', cleantime_package], |
| 33 |
+ workdir='/' |
| 34 |
+ )) |
| 35 |
+ aftersteps_list.append( |
| 36 |
+ steps.ShellCommand( |
| 37 |
+ flunkOnFailure=False, |
| 38 |
+ name = 'Run eclean Distfiles', |
| 39 |
+ command=['eclean-dist', '-Ct', cleantime_distfiles], |
| 40 |
+ workdir='/' |
| 41 |
+ )) |
| 42 |
+ # Fix/Check Packages file |
| 43 |
+ aftersteps_list.append( |
| 44 |
+ steps.ShellCommand( |
| 45 |
+ flunkOnFailure=False, |
| 46 |
+ name='Fix/Check binary Package file', |
| 47 |
+ command=['emaint', 'binhost', '--fix'], |
| 48 |
+ workdir='/' |
| 49 |
+ )) |
| 50 |
+ |
| 51 |
if self.step == 'match': |
| 52 |
shell_commad_list.append('-pO') |
| 53 |
# don't use bin for match |
| 54 |
@@ -1191,6 +1219,7 @@ class RunBuild(BuildStep): |
| 55 |
aftersteps_list.append(RunEmerge(step='pre-depclean')) |
| 56 |
aftersteps_list.append(RunEmerge(step='preserved-libs')) |
| 57 |
aftersteps_list.append(RunEmerge(step='depclean')) |
| 58 |
+ aftersteps_list.append(RunEmerge(step='eclean')) |
| 59 |
self.setProperty('depclean', False, 'depclean') |
| 60 |
self.setProperty('preserved_libs', False, 'preserved-libs') |
| 61 |
yield self.build.addStepsAfterCurrentStep(aftersteps_list) |
Archives