| 1 |
commit: ad1ecea15142bd7bf0165979e2bbda4d19a27207 |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 24 00:45:11 2022 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 24 00:45:11 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=ad1ecea1 |
| 7 |
|
| 8 |
change how remove portage dir is done |
| 9 |
|
| 10 |
Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org> |
| 11 |
|
| 12 |
buildbot_gentoo_ci/config/buildfactorys.py | 37 +++++++++++++++++++++++------- |
| 13 |
1 file changed, 29 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/buildbot_gentoo_ci/config/buildfactorys.py b/buildbot_gentoo_ci/config/buildfactorys.py |
| 16 |
index 53e7bb1..86fa162 100644 |
| 17 |
--- a/buildbot_gentoo_ci/config/buildfactorys.py |
| 18 |
+++ b/buildbot_gentoo_ci/config/buildfactorys.py |
| 19 |
@@ -3,6 +3,7 @@ |
| 20 |
|
| 21 |
from buildbot.plugins import steps as buildbot_steps |
| 22 |
from buildbot.plugins import util |
| 23 |
+from twisted.internet import defer |
| 24 |
|
| 25 |
from buildbot_gentoo_ci.steps import update_db |
| 26 |
from buildbot_gentoo_ci.steps import category |
| 27 |
@@ -93,6 +94,7 @@ def build_request_check(): |
| 28 |
f.addStep(builders.GetProjectRepositoryData()) |
| 29 |
return f |
| 30 |
|
| 31 |
+#@defer.inlineCallbacks |
| 32 |
def run_build_request(): |
| 33 |
f = util.BuildFactory() |
| 34 |
# set needed Propertys |
| 35 |
@@ -101,23 +103,42 @@ def run_build_request(): |
| 36 |
f.addStep(builders.UpdateRepos()) |
| 37 |
# Clean and add new /etc/portage |
| 38 |
#NOTE: remove the symlink befor the dir |
| 39 |
+ #f.addStep(buildbot_steps.ShellCommand( |
| 40 |
+ # flunkOnFailure=False, |
| 41 |
+ # name='Clean make.profile', |
| 42 |
+ # command=['rm', 'make.profile'], |
| 43 |
+ # workdir='/etc/portage/' |
| 44 |
+ # )) |
| 45 |
+ if buildbot_steps.FileExists(file='portage/make.conf', workdir='/etc/', haltOnFailure = False): |
| 46 |
+ f.addStep(buildbot_steps.ShellCommand( |
| 47 |
+ flunkOnFailure=False, |
| 48 |
+ name='Remove portage dir', |
| 49 |
+ command=['rm', '-R', 'portage'], |
| 50 |
+ workdir='/etc/' |
| 51 |
+ )) |
| 52 |
f.addStep(buildbot_steps.ShellCommand( |
| 53 |
- command=['rm', 'make.profile'], |
| 54 |
- workdir='/etc/portage/' |
| 55 |
+ flunkOnFailure=False, |
| 56 |
+ name='Create portage dir', |
| 57 |
+ command=['mkdir', 'portage'], |
| 58 |
+ workdir='/etc/' |
| 59 |
)) |
| 60 |
- f.addStep(buildbot_steps.RemoveDirectory(dir="portage", |
| 61 |
- workdir='/etc/')) |
| 62 |
- f.addStep(buildbot_steps.MakeDirectory(dir="portage", |
| 63 |
- workdir='/etc/')) |
| 64 |
+ #f.addStep(buildbot_steps.RemoveDirectory(dir="portage", |
| 65 |
+ # name='Remove portage dir', |
| 66 |
+ # workdir='/etc/')) |
| 67 |
+ #f.addStep(buildbot_steps.MakeDirectory(dir="portage", |
| 68 |
+ # name = 'Create the portage dir', |
| 69 |
+ # workdir='/etc/')) |
| 70 |
# Clean /var/cache/portage/logs and emerge.log |
| 71 |
f.addStep(buildbot_steps.ShellCommand( |
| 72 |
+ flunkOnFailure=False, |
| 73 |
name='Clean emerge.log', |
| 74 |
command=['rm', 'emerge.log'], |
| 75 |
workdir='/var/log/' |
| 76 |
)) |
| 77 |
- f.addStep(buildbot_steps.ShellCommand( |
| 78 |
+ if buildbot_steps.FileExists(file='logs', workdir='/var/cache/portage/',haltOnFailure = False): |
| 79 |
+ f.addStep(buildbot_steps.ShellCommand( |
| 80 |
flunkOnFailure=False, |
| 81 |
- name='Clean logs', |
| 82 |
+ name='Remove logs', |
| 83 |
command=['rm', '-R', 'logs'], |
| 84 |
workdir='/var/cache/portage/' |
| 85 |
)) |
Archives