Use deep on eclean and check string on faild_cpv

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

1 files changed, 19 insertions, 11 deletions

diff --git a/buildbot_gentoo_ci/steps/builders.py b/buildbot_gentoo_ci/steps/builders.py
index 64a3600..8692813 100644
--- a/buildbot_gentoo_ci/steps/builders.py
+++ b/buildbot_gentoo_ci/steps/builders.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import os
@@ -492,23 +492,23 @@ class RunEmerge(BuildStep):
 
         # Run eclean on Packages and Distfiles
         #FIXME: cleantime set in config
-        cleantime_package = '1w'
+        cleantime_package = '2d'
         cleantime_distfiles = '2d'
         if self.step == 'eclean':
             aftersteps_list.append(
                 steps.ShellCommand(
                         flunkOnFailure=False,
                         name = 'Run eclean Packages',
-                        command=['eclean-pkg', '-Ct', cleantime_package],
+                        command=['eclean-pkg', '-C','-d', '-t' + cleantime_package],
+                        workdir='/'
+                ))
+            aftersteps_list.append(
+                steps.ShellCommand(
+                        flunkOnFailure=False,
+                        name = 'Run eclean Distfiles',
+                        command=['eclean-dist', '-C', '-d', '-t' + cleantime_distfiles],
                         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(
@@ -946,6 +946,7 @@ class CheckEmergeLogs(BuildStep):
                                 log_path = log_path,
                                 full_logname = full_logname
                                 )
+            print('log_dict')
             print(log_dict)
         if self.step == 'extra-build':
             #FIXME: Check if extra build did work
@@ -962,15 +963,19 @@ class CheckEmergeLogs(BuildStep):
             retrays = 1
             # Find log for cpv that was requested or did failed
             if not log_dict == {}:
+                print('log_dict not emty')
                 # requested cpv
                 cpv = self.getProperty('cpv')
                 faild_version_data = False
                 if cpv in log_dict or self.faild_cpv in log_dict:
+                    print(cpv)
+                    print(self.faild_cpv)
                     yield self.createDistDir()
                     if cpv in log_dict:
                         self.log_data[cpv] = log_dict[cpv]
                         yield self.getLogFile(cpv, log_dict)
-                    if self.faild_cpv:
+                    if isinstance(self.faild_cpv, str):
+                        print('faild_cpv is string')
                         c = yield catpkgsplit(self.faild_cpv)[0]
                         if c == 'dev-haskell':
                             rebuild = 'haskell'
@@ -984,10 +989,13 @@ class CheckEmergeLogs(BuildStep):
                                 yield self.getLogFile(self.faild_cpv, log_dict)
                                 faild_version_data = yield self.getVersionData(self.faild_cpv)
                             self.setProperty('faild_cpv', self.faild_cpv, 'faild_cpv')
+                            print(faild_version_data)
+                            print('getEmergeFiles')
                             self.getEmergeFiles(self.faild_cpv)
                             self.getBuildWorkDirs(self.faild_cpv)
                             rebuild = False
                     else:
+                        print('getEmergeFiles')
                         self.getEmergeFiles(cpv)
                     if not rebuild:
                         self.aftersteps_list.append(steps.Trigger(