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