commit: 8972add1c81713e03444dee9c0847dd2a80b9cf0
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 19:32:47 2021 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 19:32:47 2021 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=8972add1
move the depclean steps
Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org>
buildbot_gentoo_ci/config/buildfactorys.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/buildbot_gentoo_ci/config/buildfactorys.py
b/buildbot_gentoo_ci/config/buildfactorys.py
index b22e1dc..a6f2183 100644
--- a/buildbot_gentoo_ci/config/buildfactorys.py
+++ b/buildbot_gentoo_ci/config/buildfactorys.py
@@ -122,15 +122,17 @@ def run_build_request():
# run update package on worker
f.addStep(builders.RunEmerge(step='update'))
# check log
- # run pretend @preserved-rebuild if needed
- f.addStep(builders.RunEmerge(step='preserved-libs'))
- # check log
# run depclean if set
# depclean pretend
f.addStep(builders.RunEmerge(step='pre-depclean'))
# look at the log to see if we need to do stuff
# depclean
f.addStep(builders.RunEmerge(step='depclean'))
+ # run @preserved-rebuild if needed
+ f.addStep(builders.RunEmerge(step='preserved-libs'))
+ # check log
+ # depclean
+ f.addStep(builders.RunEmerge(step='depclean'))
# check log
# setup make.conf if build id has changes make.conf as dict from
SetMakeConf
# setup package.* env if build id has changes
@@ -146,7 +148,7 @@ def run_build_request():
# clean up the worker
f.addStep(builders.RunEmerge(step='pre-depclean'))
# look at the log to see if we need to do stuff
- # depclean
+ # run depclean and preserved-libs
f.addStep(builders.RunEmerge(step='depclean'))
f.addStep(builders.RunEmerge(step='preserved-libs'))
f.addStep(builders.RunEmerge(step='depclean'))
