[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     67ae4c26aa06266d530fde15618bf6787486b4ef
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  4 20:22:24 2021 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun Apr  4 20:22:24 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=67ae4c26

Don't collaps builds

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

 buildbot_gentoo_ci/config/builders.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/buildbot_gentoo_ci/config/builders.py b/buildbot_gentoo_ci/config/builders.py
index 0235753..25b180c 100644
--- a/buildbot_gentoo_ci/config/builders.py
+++ b/buildbot_gentoo_ci/config/builders.py
@@ -10,6 +10,7 @@ def gentoo_builders(b=[]):
         name='update_db_check',
         workername='updatedb_1',
         workerbuilddir='builds',
+        collapseRequests=False,
         factory=buildfactorys.update_db_check()
         )
     )
@@ -21,6 +22,7 @@ def gentoo_builders(b=[]):
         name='update_cpv_data',
         workername='updatedb_1',
         workerbuilddir='builds',
+        collapseRequests=False,
         factory=buildfactorys.update_db_cp()
         )
     )
@@ -30,6 +32,7 @@ def gentoo_builders(b=[]):
         name='update_v_data',
         workername='updatedb_1',
         workerbuilddir='builds',
+        collapseRequests=False,
         factory=buildfactorys.update_db_v()
         )
     )
@@ -38,6 +41,7 @@ def gentoo_builders(b=[]):
     b.append(util.BuilderConfig(
         name='build_request_data',
         workername='updatedb_1',
+        collapseRequests=False,
         factory=buildfactorys.build_request_check()
         )
     )
@@ -46,6 +50,7 @@ def gentoo_builders(b=[]):
     b.append(util.BuilderConfig(
         name='run_build_request',
         workername='bot-test',
+        collapseRequests=False,
         factory=buildfactorys.run_build_request()
         )
     )
@@ -54,6 +59,7 @@ def gentoo_builders(b=[]):
     b.append(util.BuilderConfig(
         name='parse_build_log',
         workername='updatedb_1',
+        collapseRequests=False,
         factory=buildfactorys.parse_build_log()
         )
     )

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     eb2f05efcf0392a17894233de29b5c3ede8e1b43
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  6 22:27:24 2024 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Jan  6 22:27:24 2024 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=eb2f05ef

Add getGitlabContext to Gitlab status

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

 buildbot_gentoo_ci/config/reporters.py | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/buildbot_gentoo_ci/config/reporters.py b/buildbot_gentoo_ci/config/reporters.py
index 54472b0..ede9178 100644
--- a/buildbot_gentoo_ci/config/reporters.py
+++ b/buildbot_gentoo_ci/config/reporters.py
@@ -1,6 +1,8 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+from twisted.internet import defer
+
 from buildbot.plugins import util
 from buildbot.reporters.gitlab import GitLabStatusPush
 from buildbot.reporters.generators.build import BuildStatusGenerator, BuildStartEndStatusGenerator
@@ -42,9 +44,24 @@ irc_reporter = irc.IRCStatusPush("irc.libera.chat", "gci_test",
                  noticeOnChannel=True
                  )
 #gitlab
+@util.renderer
+@defer.inlineCallbacks
+def getGitlabContext(props):
+    context = None
+    gentooci = props.master.namedServices['services'].namedServices['gentooci']
+    if props.getProperty('buildername') == 'update_v_data':
+        context = 'Update database and check ebuild'
+    if props.getProperty('buildername') == 'run_build_request':
+        project_data = yield gentooci.db.projects.getProjectByUuid(props.getProperty('project_uuid'))
+        context = f"Project/{project_data['description']}/Build"
+    if props.getProperty('buildername') == 'parse_build_log':
+        project_data = yield gentooci.db.projects.getProjectByUuid(props.getProperty('project_build_data')['project_uuid'])
+        context = f"Project/{project_data['description']}/Check Log"
+    return context
 def gitlabGenerators():
     builders = [
-        #'run_build_request',
+        'update_v_data',
+        'run_build_request',
         'parse_build_log'
     ]
     return [
@@ -53,7 +70,7 @@ def gitlabGenerators():
         )
     ]
 gitlab_gentoo_org = GitLabStatusPush(token=util.Secret("gitlabToken"),
-                                #context= util.Interpolate('Buildbot %(prop:buildername)s'),
+                                context= getGitlabContext,
                                 baseURL='https://gitlab.gentoo.org',
                                 generators=gitlabGenerators(),
                                 #debug=True,

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     e75fa8c7184989508dc3c445cf8b32fd99634d99
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 10:06:11 2023 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 10:06:11 2023 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=e75fa8c7

Add SetupBugReportSteps for bugreporting

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

 buildbot_gentoo_ci/config/buildfactorys.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildbot_gentoo_ci/config/buildfactorys.py b/buildbot_gentoo_ci/config/buildfactorys.py
index 2ca2ca9..b47a209 100644
--- a/buildbot_gentoo_ci/config/buildfactorys.py
+++ b/buildbot_gentoo_ci/config/buildfactorys.py
@@ -188,10 +188,10 @@ def parse_build_log():
     f.addStep(logs.setEmergeInfoLog())
     # add package info to log and db
     f.addStep(logs.setPackageInfoLog())
+    # make the bugreport
+    f.addStep(logs.SetupBugReportSteps())
     # set BuildStatus
     f.addStep(logs.setBuildStatus())
-    # setup things for the irc bot
-    #f.addStep(logs.SetIrcInfo())
     return f
 
 def run_build_images_request():

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     599646e376fc489f091b4f53ec7574ca61cec63b
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  4 20:59:43 2023 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun Jun  4 20:59:43 2023 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=599646e3

Disable distfiles on docker

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

 buildbot_gentoo_ci/config/workers.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/buildbot_gentoo_ci/config/workers.py b/buildbot_gentoo_ci/config/workers.py
index 83eeda2..5f3a5a6 100644
--- a/buildbot_gentoo_ci/config/workers.py
+++ b/buildbot_gentoo_ci/config/workers.py
@@ -9,6 +9,8 @@ from buildbot.plugins import worker, util
 def log_docker_images(props):
     return 'bb-worker-log' + ':latest'
 
+#NOTE: Don't set distfiles if you have dist clean. Can get missing files
+#FIXME: Set in config
 @util.renderer
 def docker_volumes(props):
     volumes_list = []
@@ -16,7 +18,7 @@ def docker_volumes(props):
     src_dir = '/srv/gentoo/portage/' + props.getProperty('project_uuid')
     dest_dir = '/var/cache/portage'
     #add distdir
-    volumes_list.append(src_dir + '/distfiles' + ':' + dest_dir + '/distfiles')
+    #volumes_list.append(src_dir + '/distfiles' + ':' + dest_dir + '/distfiles')
     #add bindir
     volumes_list.append(src_dir + '/packages' + ':' + dest_dir + '/packages')
     return volumes_list
@@ -33,6 +35,7 @@ def docker_volumes_repositorys(props):
     volumes_list.append(':'.join([src_dir, dest_dir]))
     return volumes_list
 
+#FIXME: Move workers to DbConfig http://docs.buildbot.net/current/manual/configuration/dbconfig.html
 @util.renderer
 @defer.inlineCallbacks
 def getDockerHost(props, docker_worker):
@@ -45,6 +48,7 @@ def getDockerHost(props, docker_worker):
     print(node_data)
     return node_data['docker_host_url']
 
+#FIXME: Move workers to DbConfig http://docs.buildbot.net/current/manual/configuration/dbconfig.html
 @util.renderer
 @defer.inlineCallbacks
 def GetBuildDockerImage(props, docker_worker):

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     8f5231276de8cc3ad5a225a67f1f558de97d2410
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 09:46:22 2023 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun May 28 09:46:22 2023 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=8f523127

Set build_wait_timeout to 600 for log worker

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

 buildbot_gentoo_ci/config/workers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildbot_gentoo_ci/config/workers.py b/buildbot_gentoo_ci/config/workers.py
index 6f27690..83eeda2 100644
--- a/buildbot_gentoo_ci/config/workers.py
+++ b/buildbot_gentoo_ci/config/workers.py
@@ -94,6 +94,6 @@ def gentoo_workers(worker_data):
                             hostconfig=docker_hostconfig,
                             followStartupLogs=True,
                             masterFQDN='192.168.1.5',
-                            #build_wait_timeout=3600
+                            build_wait_timeout=600
                             ))
     return w

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     2967519fc01d5041a31e47e98c630f222f5a9cf4
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 09:44:59 2023 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun May 28 09:44:59 2023 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=2967519f

Use full url for Bugs

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

 buildbot_gentoo_ci/config/reporters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildbot_gentoo_ci/config/reporters.py b/buildbot_gentoo_ci/config/reporters.py
index bd55037..54472b0 100644
--- a/buildbot_gentoo_ci/config/reporters.py
+++ b/buildbot_gentoo_ci/config/reporters.py
@@ -12,7 +12,7 @@ irc_template = '''{% set resultsList = ["\x0303SUCCESS", "\x0308WARNINGS", "\x03
 {{ build['properties']['revision'][0]|truncate(10, True) }} {{ "\x0302" }}{{ build['properties']['owners'][0][0] }}{{ "\x03" }} \
 {{ "\x0306" }}{{ build['properties']['event'][0] }}{{ "\x03" }} {{ projects }}:{{ build['properties']['project_data'][0]['name'] }} \
 {{ "\x02" }}{{ "Build: "}}{{ resultsList[build['results']] }}{{ "\x03" }}{{ "\x02" }} {{ "\x0312" }}{{ build_url }}{{ "\x03" }} \
-{% if build['properties']['bgo'][0]['match'] is true %}{{ "\x0311" }}Bugid: {{build['properties']['bgo'][0]['id']}}{{ "\x03" }}{% endif %}\
+{% if build['properties']['bgo'][0]['match'] is true %}{{ "\x0311" }}Bug: {{ "\x03" }}https://bugs.gentoo.org/{{build['properties']['bgo'][0]['id']}}{% endif %}\
 '''
 
 def ircGenerators():

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     b69003d51f5ed92cc38128cdc91c47e22eaa37b1
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 09:53:42 2023 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Mon May  1 09:53:42 2023 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=b69003d5

Don't use volumes for log worker

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

 buildbot_gentoo_ci/config/workers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildbot_gentoo_ci/config/workers.py b/buildbot_gentoo_ci/config/workers.py
index 7d13f46..6f27690 100644
--- a/buildbot_gentoo_ci/config/workers.py
+++ b/buildbot_gentoo_ci/config/workers.py
@@ -90,7 +90,7 @@ def gentoo_workers(worker_data):
                             None,
                             docker_host='tcp://192.168.1.12:2375',
                             image=log_docker_images,
-                            volumes=docker_volumes_repositorys,
+                            #volumes=docker_volumes_repositorys,
                             hostconfig=docker_hostconfig,
                             followStartupLogs=True,
                             masterFQDN='192.168.1.5',

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     26929ff836acfe559456bed9f400dd4879973d8b
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 21:46:50 2022 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 21:46:50 2022 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=26929ff8

Use one scheduler for push and mr

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

 buildbot_gentoo_ci/config/schedulers.py | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/buildbot_gentoo_ci/config/schedulers.py b/buildbot_gentoo_ci/config/schedulers.py
index b769f00..60f1857 100644
--- a/buildbot_gentoo_ci/config/schedulers.py
+++ b/buildbot_gentoo_ci/config/schedulers.py
@@ -42,9 +42,17 @@ def getGitChanges(props):
     change_data['project'] = k['project']
     return change_data
 
-def mr_branch_fn(branch):
-    # if branch end with -mr or -pr
-    if branch[-3] == '-mr' or branch[-3] == '-pr':
+def bb_branch_fn(branch):
+    # check branch
+    print(f"Branch: {branch}")
+    if branch.endswith('-mr') or branch.endswith('-pr') or branch == 'master':
+        return True
+    return False
+
+def bb_category_fn(category):
+    # check event
+    print(f"Category: {category}")
+    if category == 'push' or category == 'merge_request':
         return True
     return False
 
@@ -56,16 +64,7 @@ def gentoo_schedulers():
                         change_data = getGitChanges
                         ),
         builderNames = builderUpdateDbNames,
-        change_filter=util.ChangeFilter(branch='master', category='push'),
-    )
-    scheduler_update_db_mr= schedulers.SingleBranchScheduler(
-        name='scheduler_update_db_mr',
-        treeStableTimer=0,
-        properties = dict(
-                        change_data = getGitChanges
-                        ),
-        builderNames = builderUpdateDbNames,
-        change_filter=util.ChangeFilter(branch_fn=mr_branch_fn, category='merge_request'),
+        change_filter=util.ChangeFilter(branch_fn=bb_branch_fn, category_fn=bb_category_fn),
     )
     create_stage4 = schedulers.ForceScheduler(
         name="create_stage4",
@@ -102,7 +101,6 @@ def gentoo_schedulers():
     s = []
     s.append(create_stage4)
     s.append(scheduler_update_db)
-    s.append(scheduler_update_db_mr)
     s.append(update_repo_check)
     s.append(update_cpv_data)
     s.append(update_v_data)

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     457eadb511be7e44744cfa4a91a302614b5d754f
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 22:43:32 2022 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 22:43:32 2022 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=457eadb5

Add scheduler_update_db_mr for mr/pr support

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

 buildbot_gentoo_ci/config/schedulers.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/buildbot_gentoo_ci/config/schedulers.py b/buildbot_gentoo_ci/config/schedulers.py
index 2e5379c..b769f00 100644
--- a/buildbot_gentoo_ci/config/schedulers.py
+++ b/buildbot_gentoo_ci/config/schedulers.py
@@ -39,8 +39,15 @@ def getGitChanges(props):
     change_data['revision'] = k['revision']
     change_data['timestamp'] = k['when_timestamp']
     change_data['branch'] = k['branch']
+    change_data['project'] = k['project']
     return change_data
 
+def mr_branch_fn(branch):
+    # if branch end with -mr or -pr
+    if branch[-3] == '-mr' or branch[-3] == '-pr':
+        return True
+    return False
+
 def gentoo_schedulers():
     scheduler_update_db = schedulers.SingleBranchScheduler(
         name='scheduler_update_db',
@@ -49,7 +56,16 @@ def gentoo_schedulers():
                         change_data = getGitChanges
                         ),
         builderNames = builderUpdateDbNames,
-        change_filter=util.ChangeFilter(branch='master'),
+        change_filter=util.ChangeFilter(branch='master', category='push'),
+    )
+    scheduler_update_db_mr= schedulers.SingleBranchScheduler(
+        name='scheduler_update_db_mr',
+        treeStableTimer=0,
+        properties = dict(
+                        change_data = getGitChanges
+                        ),
+        builderNames = builderUpdateDbNames,
+        change_filter=util.ChangeFilter(branch_fn=mr_branch_fn, category='merge_request'),
     )
     create_stage4 = schedulers.ForceScheduler(
         name="create_stage4",
@@ -86,6 +102,7 @@ def gentoo_schedulers():
     s = []
     s.append(create_stage4)
     s.append(scheduler_update_db)
+    s.append(scheduler_update_db_mr)
     s.append(update_repo_check)
     s.append(update_cpv_data)
     s.append(update_v_data)

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     795fec9c1b421559ade5b82fc7232384d31a02d2
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 11:35:00 2022 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 11:35:00 2022 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=795fec9c

Add support branch,event and gitlab/github project name on IRC reporter

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

 buildbot_gentoo_ci/config/reporters.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildbot_gentoo_ci/config/reporters.py b/buildbot_gentoo_ci/config/reporters.py
index d37dd2a..9832305 100644
--- a/buildbot_gentoo_ci/config/reporters.py
+++ b/buildbot_gentoo_ci/config/reporters.py
@@ -8,9 +8,9 @@ from buildbot.reporters.message import MessageFormatter
 
 from buildbot_gentoo_ci.reporters import irc
 irc_template = '''{% set resultsList = ["\x0303SUCCESS", "\x0308WARNINGS", "\x0304FAILURE"] %}\
-{{ "\x02" }}{{ build['properties']['cpv'][0] }}{{ "\x02" }} {{ "\x0303" }}repo/{{ projects }}{{ "\x03" }} \
+{{ "\x02" }}{{ build['properties']['cpv'][0] }}{{ "\x02" }} {{ "\x0303" }}repo/{{ projects }}:{{ build['properties']['branch'][0] }}{{ "\x03" }} \
 {{ build['properties']['revision'][0]|truncate(10, True) }} {{ "\x0302" }}{{ build['properties']['owners'][0][0] }}{{ "\x03" }} \
-{{ build['properties']['project_data'][0]['name'] }} \
+{{ build['properties']['event'][0] }} {{ projects }}:{{ build['properties']['project_data'][0]['name'] }} \
 {{ "\x02" }}{{ "Build: "}}{{ resultsList[build['results']] }}{{ "\x03" }}{{ "\x02" }} {{ "\x0312" }}{{ build_url }}{{ "\x03" }}\
 '''
 

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     e6adf0b1f7cad72329eed2d90021e024d43b1f83
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 19:53:13 2022 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 19:53:13 2022 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=e6adf0b1

Use ReadEmergeInfoLog

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

 buildbot_gentoo_ci/config/buildfactorys.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildbot_gentoo_ci/config/buildfactorys.py b/buildbot_gentoo_ci/config/buildfactorys.py
index ef68f2d..426cee9 100644
--- a/buildbot_gentoo_ci/config/buildfactorys.py
+++ b/buildbot_gentoo_ci/config/buildfactorys.py
@@ -207,7 +207,7 @@ def parse_build_log():
     # add sum log to buildbot log
     f.addStep(logs.setBuildbotLog())
     # pers the emerge info
-    f.addStep(logs.SetupParserEmergeInfoLog())
+    f.addStep(logs.ReadEmergeInfoLog())
     # add emerge info to log and db
     f.addStep(logs.setEmergeInfoLog())
     # add package info to log and db

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     d50096480ef4f1737767d927ed76a9e53590761a
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 11 09:52:10 2022 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 09:52:10 2022 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=d5009648

Disable log upload step to cloud

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

 buildbot_gentoo_ci/config/buildfactorys.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildbot_gentoo_ci/config/buildfactorys.py b/buildbot_gentoo_ci/config/buildfactorys.py
index a714e47..ef68f2d 100644
--- a/buildbot_gentoo_ci/config/buildfactorys.py
+++ b/buildbot_gentoo_ci/config/buildfactorys.py
@@ -200,7 +200,7 @@ def parse_build_log():
     # pers the log from pkg check
     #f.addStep(logs.ParserPkgCheckLog())
     # Upload the log to the cloud and remove the log
-    f.addStep(logs.Upload())
+    #f.addStep(logs.Upload())
     # check the sum log if we need to make a issue/bug/pr report
     # set it SUCCESS/FAILURE/WARNINGS
     f.addStep(logs.MakeIssue())

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     acb84d738be07a975aaeba84e97d1e28b0356269
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 00:12:57 2022 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 00:12:57 2022 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=acb84d73

Add support for buildbot 3.5.0

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

 buildbot_gentoo_ci/config/config.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/buildbot_gentoo_ci/config/config.py b/buildbot_gentoo_ci/config/config.py
index 3fed5d2..faf2058 100644
--- a/buildbot_gentoo_ci/config/config.py
+++ b/buildbot_gentoo_ci/config/config.py
@@ -44,7 +44,8 @@ from buildbot.util import safeTranslate
 from buildbot.util import service as util_service
 from buildbot.warnings import ConfigWarning
 from buildbot.warnings import warn_deprecated
-from buildbot.config import ConfigErrors, error, loadConfigDict
+from buildbot.config import ConfigErrors, error
+from buildbot.config.master import loadConfigDict
 
 _errors = None
 

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     1c1e3c168bc09b5c43978b8880390262d9f6e9bd
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 12:31:43 2022 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 12:31:43 2022 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=1c1e3c16

Add support for node workers

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

 buildbot_gentoo_ci/config/builders.py | 11 +++++++++++
 buildbot_gentoo_ci/config/workers.py  | 24 ++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/buildbot_gentoo_ci/config/builders.py b/buildbot_gentoo_ci/config/builders.py
index ca7fc73..6f3d606 100644
--- a/buildbot_gentoo_ci/config/builders.py
+++ b/buildbot_gentoo_ci/config/builders.py
@@ -25,6 +25,7 @@ def gentoo_builders(worker_data):
     g_ci_w = gentoo_ci_workers(worker_data)
     LocalWorkers = g_ci_w.getLocalWorkersUuid()
     BuildWorkers = g_ci_w.getBuildWorkersUuid()
+    NodeWorkers = g_ci_w.getNodeWorkersUuid()
     b.append(util.BuilderConfig(
         name='update_db_check',
         workername=LocalWorkers[0],
@@ -87,4 +88,14 @@ def gentoo_builders(worker_data):
         factory=buildfactorys.parse_build_log()
         )
     )
+    # For node workers
+    b.append(util.BuilderConfig(
+        name='run_build_stage4_request',
+        workernames=NodeWorkers,
+        #FIXME: support more the one node
+        #canStartBuild=CanWorkerBuildProject,
+        collapseRequests=False,
+        factory=buildfactorys.run_build_stage4_request()
+        )
+    )
     return b

diff --git a/buildbot_gentoo_ci/config/workers.py b/buildbot_gentoo_ci/config/workers.py
index d9e7061..fbdc2a9 100644
--- a/buildbot_gentoo_ci/config/workers.py
+++ b/buildbot_gentoo_ci/config/workers.py
@@ -18,7 +18,7 @@ class gentoo_ci_workers():
     def getBuildWorkersUuid(self):
         build_worker = []
         for worker in self.worker_data:
-            if worker['type'] != 'local' and worker['enable'] is True:
+            if (worker['type'] != 'local' and worker['type'] != 'node') and worker['enable'] is True:
                 build_worker.append(worker['uuid'])
         print(build_worker)
         return build_worker
@@ -26,19 +26,39 @@ class gentoo_ci_workers():
     def getBuildWorkersAllData(self):
         build_worker = []
         for worker in self.worker_data:
-            if worker['type'] != 'local' and worker['enable'] is True:
+            if (worker['type'] != 'local' and worker['type'] != 'node') and worker['enable'] is True:
                 build_worker.append(worker)
         print(build_worker)
         return build_worker
 
+    def getNodeWorkersUuid(self):
+        node_worker = []
+        for worker in self.worker_data:
+            if worker['type'] == 'node' and worker['enable'] is True:
+                node_worker.append(worker['uuid'])
+        print(node_worker)
+        return node_worker
+
+    def getNodedWorkersAllData(self):
+        node_worker = []
+        for worker in self.worker_data:
+            if worker['type'] == 'node' and worker['enable'] is True:
+                node_worker.append(worker)
+        print(node_worker)
+        return node_worker
+
 def gentoo_workers(worker_data):
     w = []
     g_ci_w = gentoo_ci_workers(worker_data)
     LocalWorkers = g_ci_w.getLocalWorkersUuid()
     BuildWorkers = g_ci_w.getBuildWorkersAllData()
+    NodeWorkers = g_ci_w.getNodedWorkersAllData()
     for local_worker in LocalWorkers:
         w.append(worker.LocalWorker(local_worker))
     for build_worker in BuildWorkers:
         if build_worker['type'] == 'default':
             w.append(worker.Worker(build_worker['uuid'], build_worker['password']))
+    for node_worker in NodeWorkers:
+        if node_worker['type'] == 'node':
+            w.append(worker.Worker(node_worker['uuid'], node_worker['password']))
     return w

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     ad1ecea15142bd7bf0165979e2bbda4d19a27207
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 00:45:11 2022 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 00:45:11 2022 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=ad1ecea1

change how remove portage dir is done

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

 buildbot_gentoo_ci/config/buildfactorys.py | 37 +++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/buildbot_gentoo_ci/config/buildfactorys.py b/buildbot_gentoo_ci/config/buildfactorys.py
index 53e7bb1..86fa162 100644
--- a/buildbot_gentoo_ci/config/buildfactorys.py
+++ b/buildbot_gentoo_ci/config/buildfactorys.py
@@ -3,6 +3,7 @@
 
 from buildbot.plugins import steps as buildbot_steps
 from buildbot.plugins import util
+from twisted.internet import defer
 
 from buildbot_gentoo_ci.steps import update_db
 from buildbot_gentoo_ci.steps import category
@@ -93,6 +94,7 @@ def build_request_check():
     f.addStep(builders.GetProjectRepositoryData())
     return f
 
+#@defer.inlineCallbacks
 def run_build_request():
     f = util.BuildFactory()
     # set needed Propertys
@@ -101,23 +103,42 @@ def run_build_request():
     f.addStep(builders.UpdateRepos())
     # Clean and add new /etc/portage
     #NOTE: remove the symlink befor the dir
+    #f.addStep(buildbot_steps.ShellCommand(
+    #                    flunkOnFailure=False,
+    #                    name='Clean make.profile',
+    #                    command=['rm', 'make.profile'],
+    #                    workdir='/etc/portage/'
+    #                    ))
+    if buildbot_steps.FileExists(file='portage/make.conf', workdir='/etc/', haltOnFailure = False):
+        f.addStep(buildbot_steps.ShellCommand(
+                        flunkOnFailure=False,
+                        name='Remove portage dir',
+                        command=['rm', '-R', 'portage'],
+                        workdir='/etc/'
+                        ))
     f.addStep(buildbot_steps.ShellCommand(
-                        command=['rm', 'make.profile'],
-                        workdir='/etc/portage/'
+                        flunkOnFailure=False,
+                        name='Create portage dir',
+                        command=['mkdir', 'portage'],
+                        workdir='/etc/'
                         ))
-    f.addStep(buildbot_steps.RemoveDirectory(dir="portage",
-                                workdir='/etc/'))
-    f.addStep(buildbot_steps.MakeDirectory(dir="portage",
-                                workdir='/etc/'))
+    #f.addStep(buildbot_steps.RemoveDirectory(dir="portage",
+    #                            name='Remove portage dir',
+    #                            workdir='/etc/'))
+    #f.addStep(buildbot_steps.MakeDirectory(dir="portage",
+    #                            name = 'Create the portage dir',
+    #                            workdir='/etc/'))
     # Clean /var/cache/portage/logs and emerge.log
     f.addStep(buildbot_steps.ShellCommand(
+                        flunkOnFailure=False,
                         name='Clean emerge.log',
                         command=['rm', 'emerge.log'],
                         workdir='/var/log/'
                         ))
-    f.addStep(buildbot_steps.ShellCommand(
+    if buildbot_steps.FileExists(file='logs', workdir='/var/cache/portage/',haltOnFailure = False):
+        f.addStep(buildbot_steps.ShellCommand(
                         flunkOnFailure=False,
-                        name='Clean logs',
+                        name='Remove logs',
                         command=['rm', '-R', 'logs'],
                         workdir='/var/cache/portage/'
                         ))

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     52f785d4268d9238e940e4c2b3297f7cdeeea0a8
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  8 17:22:11 2022 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Jan  8 17:22:11 2022 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=52f785d4

clean portage logs

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

 buildbot_gentoo_ci/config/buildfactorys.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/buildbot_gentoo_ci/config/buildfactorys.py b/buildbot_gentoo_ci/config/buildfactorys.py
index 6203a1f..53e7bb1 100644
--- a/buildbot_gentoo_ci/config/buildfactorys.py
+++ b/buildbot_gentoo_ci/config/buildfactorys.py
@@ -109,6 +109,18 @@ def run_build_request():
                                 workdir='/etc/'))
     f.addStep(buildbot_steps.MakeDirectory(dir="portage",
                                 workdir='/etc/'))
+    # Clean /var/cache/portage/logs and emerge.log
+    f.addStep(buildbot_steps.ShellCommand(
+                        name='Clean emerge.log',
+                        command=['rm', 'emerge.log'],
+                        workdir='/var/log/'
+                        ))
+    f.addStep(buildbot_steps.ShellCommand(
+                        flunkOnFailure=False,
+                        name='Clean logs',
+                        command=['rm', '-R', 'logs'],
+                        workdir='/var/cache/portage/'
+                        ))
     # setup the profile
     #NOTE: pkgcheck do not support it as a dir
     #f.addStep(buildbot_steps.MakeDirectory(dir="make.profile",

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     fa21ff6afa0f4ba9769a55e1d7bc59cf9dcca1c8
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 27 20:08:54 2021 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Wed Oct 27 20:08:54 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=fa21ff6a

Move repo update step before portage steps for workers

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

 buildbot_gentoo_ci/config/buildfactorys.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/buildbot_gentoo_ci/config/buildfactorys.py b/buildbot_gentoo_ci/config/buildfactorys.py
index 45f8f48..d5f881b 100644
--- a/buildbot_gentoo_ci/config/buildfactorys.py
+++ b/buildbot_gentoo_ci/config/buildfactorys.py
@@ -95,10 +95,10 @@ def build_request_check():
 
 def run_build_request():
     f = util.BuildFactory()
-    # FIXME: 5
-    # Move the etc/portage stuff to is own file
     # set needed Propertys
     f.addStep(builders.SetupPropertys())
+    # update the repositorys listed in project_repository
+    f.addStep(builders.UpdateRepos())
     # Clean and add new /etc/portage
     #NOTE: remove the symlink befor the dir
     f.addStep(buildbot_steps.ShellCommand(
@@ -118,8 +118,6 @@ def run_build_request():
     f.addStep(buildbot_steps.MakeDirectory(dir="repos.conf",
                                 workdir='/etc/portage/'))
     f.addStep(portage.SetReposConf())
-    # update the repositorys listed in project_repository
-    f.addStep(builders.UpdateRepos())
     # setup make.conf
     f.addStep(portage.SetMakeConf())
     # setup env

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     df8b25b39d422fd8152e6113c1443835d5aee091
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 16 14:57:34 2021 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Oct 16 14:57:34 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=df8b25b3

Set the workers in worker_data in master.cfg

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

 buildbot_gentoo_ci/config/builders.py | 21 +++++++---------
 buildbot_gentoo_ci/config/workers.py  | 45 +++++++++++++++++++++++++++++------
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/buildbot_gentoo_ci/config/builders.py b/buildbot_gentoo_ci/config/builders.py
index c28d016..ca7fc73 100644
--- a/buildbot_gentoo_ci/config/builders.py
+++ b/buildbot_gentoo_ci/config/builders.py
@@ -5,16 +5,7 @@ from twisted.internet import defer
 
 from buildbot.plugins import util
 from buildbot_gentoo_ci.config import buildfactorys
-
-# FIXME: get LocalWorkers and BuildWorkers from db or file
-LocalWorkers = []
-LocalWorkers.append('updatedb_1')
-LocalWorkers.append('updatedb_2')
-LocalWorkers.append('updatedb_3')
-LocalWorkers.append('updatedb_4')
-
-BuildWorkers = []
-BuildWorkers.append('a89c2c1a-46e0-4ded-81dd-c51afeb7fcfd')
+from buildbot_gentoo_ci.config.workers import gentoo_ci_workers
 
 @defer.inlineCallbacks
 def CanWorkerBuildProject(builder, wfb, request):
@@ -29,10 +20,14 @@ def CanWorkerBuildProject(builder, wfb, request):
     print('no worker')
     return False
 
-def gentoo_builders(b=[]):
+def gentoo_builders(worker_data):
+    b = []
+    g_ci_w = gentoo_ci_workers(worker_data)
+    LocalWorkers = g_ci_w.getLocalWorkersUuid()
+    BuildWorkers = g_ci_w.getBuildWorkersUuid()
     b.append(util.BuilderConfig(
         name='update_db_check',
-        workername='updatedb_1',
+        workername=LocalWorkers[0],
         workerbuilddir='builds',
         collapseRequests=False,
         factory=buildfactorys.update_db_check()
@@ -40,7 +35,7 @@ def gentoo_builders(b=[]):
     )
     b.append(util.BuilderConfig(
         name='update_repo_check',
-        workername='updatedb_2',
+        workername=LocalWorkers[1],
         workerbuilddir='builds',
         collapseRequests=True,
         factory=buildfactorys.update_repo_check()

diff --git a/buildbot_gentoo_ci/config/workers.py b/buildbot_gentoo_ci/config/workers.py
index 6141d89..d9e7061 100644
--- a/buildbot_gentoo_ci/config/workers.py
+++ b/buildbot_gentoo_ci/config/workers.py
@@ -3,11 +3,42 @@
 
 from buildbot.plugins import worker
 
-def gentoo_workers(w=[]):
-    # FIXME: Get workers from db
-    w.append(worker.LocalWorker('updatedb_1'))
-    w.append(worker.LocalWorker('updatedb_2'))
-    w.append(worker.LocalWorker('updatedb_3'))
-    w.append(worker.LocalWorker('updatedb_4'))
-    w.append(worker.Worker('bot-test', 'test1234'))
+class gentoo_ci_workers():
+    def __init__(self, worker_data, **kwargs):
+        self.worker_data = worker_data
+
+    def getLocalWorkersUuid(self):
+        local_worker = []
+        for worker in self.worker_data:
+            if worker['type'] == 'local' and worker['enable'] is True:
+                local_worker.append(worker['uuid'])
+        print(local_worker)
+        return local_worker
+
+    def getBuildWorkersUuid(self):
+        build_worker = []
+        for worker in self.worker_data:
+            if worker['type'] != 'local' and worker['enable'] is True:
+                build_worker.append(worker['uuid'])
+        print(build_worker)
+        return build_worker
+
+    def getBuildWorkersAllData(self):
+        build_worker = []
+        for worker in self.worker_data:
+            if worker['type'] != 'local' and worker['enable'] is True:
+                build_worker.append(worker)
+        print(build_worker)
+        return build_worker
+
+def gentoo_workers(worker_data):
+    w = []
+    g_ci_w = gentoo_ci_workers(worker_data)
+    LocalWorkers = g_ci_w.getLocalWorkersUuid()
+    BuildWorkers = g_ci_w.getBuildWorkersAllData()
+    for local_worker in LocalWorkers:
+        w.append(worker.LocalWorker(local_worker))
+    for build_worker in BuildWorkers:
+        if build_worker['type'] == 'default':
+            w.append(worker.Worker(build_worker['uuid'], build_worker['password']))
     return w

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     bd8eed5bc56b32968b97d65e06ae1480fc39e556
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  2 21:59:48 2021 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Fri Apr  2 21:59:48 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=bd8eed5b

Check all code changes in GitPoller pull

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

 buildbot_gentoo_ci/config/schedulers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildbot_gentoo_ci/config/schedulers.py b/buildbot_gentoo_ci/config/schedulers.py
index 1941a82..5be8419 100644
--- a/buildbot_gentoo_ci/config/schedulers.py
+++ b/buildbot_gentoo_ci/config/schedulers.py
@@ -41,7 +41,7 @@ def gitUpdateDb(props):
 def gentoo_schedulers():
     scheduler_update_db = schedulers.SingleBranchScheduler(
         name='scheduler_update_db',
-        treeStableTimer=60,
+        treeStableTimer=0,
         properties = {
                         'git_changes' : gitUpdateDb,
                     },

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     8fb10ec717e99e1fd4e110112319514efeb724c8
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 21:54:09 2021 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 21:54:09 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=8fb10ec7

Remove the symlink for make.profile before we remove the portage dir

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

 buildbot_gentoo_ci/config/buildfactorys.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/buildbot_gentoo_ci/config/buildfactorys.py b/buildbot_gentoo_ci/config/buildfactorys.py
index a6f2183..ac8bac1 100644
--- a/buildbot_gentoo_ci/config/buildfactorys.py
+++ b/buildbot_gentoo_ci/config/buildfactorys.py
@@ -92,7 +92,11 @@ def run_build_request():
     # set needed Propertys
     f.addStep(builders.SetupPropertys())
     # Clean and add new /etc/portage
-    #FIXME: Is don't like symlinks
+    #NOTE: remove the symlink befor the dir
+    f.addStep(buildbot_steps.ShellCommandNewStyle(
+                        command=['rm', 'make.profile'],
+                        workdir='/etc/portage/'
+                        ))
     f.addStep(buildbot_steps.RemoveDirectory(dir="portage",
                                 workdir='/etc/'))
     f.addStep(buildbot_steps.MakeDirectory(dir="portage",

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

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'))

[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/config/

[Magnus Granberg]

commit:     ad0e3e17558f34e3c404a855109ec3dddbc38a01
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 09:17:57 2020 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 09:17:57 2020 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=ad0e3e17

Fixme list for f_update_db_packages

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

 buildbot_gentoo_ci/config/builders.py      | 10 ++++++++--
 buildbot_gentoo_ci/config/buildfactory.py  |  8 --------
 buildbot_gentoo_ci/config/buildfactorys.py | 28 ++++++++++++++++++++++++++++
 buildbot_gentoo_ci/config/workers.py       |  1 +
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/buildbot_gentoo_ci/config/builders.py b/buildbot_gentoo_ci/config/builders.py
index b663fba..114bb83 100644
--- a/buildbot_gentoo_ci/config/builders.py
+++ b/buildbot_gentoo_ci/config/builders.py
@@ -2,8 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 from buildbot.plugins import util
-from buildbot_gentoo_ci.config import buildfactory
+from buildbot_gentoo_ci.config import buildfactorys
 
 def gentoo_builders(b=[]):
-    b.append(util.BuilderConfig(name='update_db_packages', workername='updatedb_1', factory=buildfactory.f_update_db_packages()))
+    # FIXME: get workers from db
+    b.append(util.BuilderConfig(
+        name='update_db_packages', 
+        workername=[ 'updatedb_1', ], 
+        factory=buildfactorys.f_update_db_packages()
+        )
+    )
     return b

diff --git a/buildbot_gentoo_ci/config/buildfactory.py b/buildbot_gentoo_ci/config/buildfactory.py
deleted file mode 100644
index 0943031..0000000
--- a/buildbot_gentoo_ci/config/buildfactory.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-from buildbot.plugins import util
-    
-def f_update_db_packages():
-    f = util.BuildFactory()
-    return f

diff --git a/buildbot_gentoo_ci/config/buildfactorys.py b/buildbot_gentoo_ci/config/buildfactorys.py
new file mode 100644
index 0000000..ef479a2
--- /dev/null
+++ b/buildbot_gentoo_ci/config/buildfactorys.py
@@ -0,0 +1,28 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+from buildbot.plugins import util, steps
+    
+def f_update_db_packages():
+    f = util.BuildFactory()
+    # FIXME:
+    # Get base project from db
+    # Check if base project repo for is cloned
+    # Check if gentoo repo is cloned
+    # check if the profile link is there
+    # check if etc/portage has no error
+    # Get the repository some way
+    repository=util.Property('repository')
+    # For loop
+    # for cpv in util.Property('cpv_changes')
+    #   check if not categorys in db
+    #       run update categorys db step
+    #   check if not package in db
+    #       run update package db step
+    #       and get foo{cpv] with metadata back
+    #       if new or updated package
+    #   else 
+    #       run update package db step in a pool of workers
+    #       and get foo{cpv] with metadata back
+    #       if new or updated package
+    return f

diff --git a/buildbot_gentoo_ci/config/workers.py b/buildbot_gentoo_ci/config/workers.py
index 50a4751..3005129 100644
--- a/buildbot_gentoo_ci/config/workers.py
+++ b/buildbot_gentoo_ci/config/workers.py
@@ -4,5 +4,6 @@
 from buildbot.plugins import worker
 
 def gentoo_workers(w=[]):
+    # FIXME: Get workers from db
     w.append(worker.LocalWorker('updatedb_1'))
     return w