[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gentoo-commits
Subject:    [gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/steps/
From:       "Magnus Granberg" <zorry () gentoo ! org>
Date:       2023-02-28 21:41:33
Message-ID: 1677620467.c71f1b00885a6bd3851182ebc27d5eea67351cbc.zorry () gentoo
[Download RAW message or body]

commit:     c71f1b00885a6bd3851182ebc27d5eea67351cbc
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 21:41:07 2023 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 21:41:07 2023 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=c71f1b00

Add eclean to building steps

Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org>

 buildbot_gentoo_ci/steps/builders.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/buildbot_gentoo_ci/steps/builders.py b/buildbot_gentoo_ci/steps/builders.py
index 1746122..a3f82a3 100644
--- a/buildbot_gentoo_ci/steps/builders.py
+++ b/buildbot_gentoo_ci/steps/builders.py
@@ -490,6 +490,34 @@ class RunEmerge(BuildStep):
                 ))
             aftersteps_list.append(CheckDepcleanLogs('depclean'))
 
+        # Run eclean on Packages and Distfiles
+        #FIXME: cleantime set in config
+        cleantime_package = '3w'
+        cleantime_distfiles = '2d'
+        if self.step == 'eclean':
+            aftersteps_list.append(
+                steps.ShellCommand(
+                        flunkOnFailure=False,
+                        name = 'Run eclean Packages',
+                        command=['eclean-pkg', '-Ct', cleantime_package],
+                        workdir='/'
+                ))
+            aftersteps_list.append(
+                steps.ShellCommand(
+                        flunkOnFailure=False,
+                        name = 'Run eclean Distfiles',
+                        command=['eclean-dist', '-Ct', cleantime_distfiles],
+                        workdir='/'
+                ))
+            # Fix/Check Packages file
+            aftersteps_list.append(
+                steps.ShellCommand(
+                        flunkOnFailure=False,
+                        name='Fix/Check binary Package file',
+                        command=['emaint', 'binhost', '--fix'],
+                        workdir='/'
+                ))
+
         if self.step == 'match':
             shell_commad_list.append('-pO')
             # don't use bin for match
@@ -1191,6 +1219,7 @@ class RunBuild(BuildStep):
         aftersteps_list.append(RunEmerge(step='pre-depclean'))
         aftersteps_list.append(RunEmerge(step='preserved-libs'))
         aftersteps_list.append(RunEmerge(step='depclean'))
+        aftersteps_list.append(RunEmerge(step='eclean'))
         self.setProperty('depclean', False, 'depclean')
         self.setProperty('preserved_libs', False, 'preserved-libs')
         yield self.build.addStepsAfterCurrentStep(aftersteps_list)

[prev in list] [next in list] [prev in thread] [next in thread]