From 730b11c26dbef748d0635d33685ff9bcc5e3b692 Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Sat, 29 Jun 2019 11:45:35 +0200 Subject: [PATCH] Update workers to latest BuildBot release. The directory name has been changed to reflect that. --- scripts/buildbot.tac | 35 -------------------- {scripts => worker}/README | 0 {scripts => worker}/build_reactos | 0 worker/buildbot.tac | 42 ++++++++++++++++++++++++ {scripts => worker}/clean | 0 {scripts => worker}/config.inc | 0 {scripts => worker}/configure | 0 {scripts => worker}/configure_msvc | 0 {scripts => worker}/get_suffix | 0 {scripts => worker}/prepare_ahk | 0 {scripts => worker}/prepare_source | 0 {scripts => worker}/reactos.xml.template | 0 {scripts => worker}/regtest | 0 {scripts => worker}/regtestcd | 0 worker/requirements.txt | 1 + {scripts => worker}/run_tests | 0 {scripts => worker}/submit_result | 0 {scripts => worker}/sysreg.xml.template | 0 {scripts => worker}/time | 0 {scripts => worker}/uploadiso | 0 {scripts => worker}/vbox_clean | 0 {scripts => worker}/vmware_clean | 0 22 files changed, 43 insertions(+), 35 deletions(-) delete mode 100644 scripts/buildbot.tac rename {scripts => worker}/README (100%) rename {scripts => worker}/build_reactos (100%) create mode 100644 worker/buildbot.tac rename {scripts => worker}/clean (100%) rename {scripts => worker}/config.inc (100%) rename {scripts => worker}/configure (100%) rename {scripts => worker}/configure_msvc (100%) rename {scripts => worker}/get_suffix (100%) rename {scripts => worker}/prepare_ahk (100%) rename {scripts => worker}/prepare_source (100%) rename {scripts => worker}/reactos.xml.template (100%) rename {scripts => worker}/regtest (100%) rename {scripts => worker}/regtestcd (100%) create mode 100644 worker/requirements.txt rename {scripts => worker}/run_tests (100%) rename {scripts => worker}/submit_result (100%) rename {scripts => worker}/sysreg.xml.template (100%) rename {scripts => worker}/time (100%) rename {scripts => worker}/uploadiso (100%) rename {scripts => worker}/vbox_clean (100%) rename {scripts => worker}/vmware_clean (100%) diff --git a/scripts/buildbot.tac b/scripts/buildbot.tac deleted file mode 100644 index e248183..0000000 --- a/scripts/buildbot.tac +++ /dev/null @@ -1,35 +0,0 @@ -import os - -from twisted.application import service -from buildslave.bot import BuildSlave - -basedir = r'/srv/buildbot' -rotateLength = 10000000 -maxRotatedFiles = 10 - -# note: this line is matched against to check that this is a buildslave -# directory; do not edit it. -application = service.Application('buildslave') - -try: - from twisted.python.logfile import LogFile - from twisted.python.log import ILogObserver, FileLogObserver - logfile = LogFile.fromFullPath(os.path.join(basedir, "twistd.log"), rotateLength=rotateLength, - maxRotatedFiles=maxRotatedFiles) - application.setComponent(ILogObserver, FileLogObserver(logfile).emit) -except ImportError: - # probably not yet twisted 8.2.0 and beyond, can't set log yet - pass - -buildmaster_host = 'build.reactos.org' -port = 9989 -slavename = 'SLAVENAME_HERE' -passwd = 'PASSWORD_HERE' -keepalive = 60 -usepty = 1 -umask = 022 -maxdelay = 30 - -s = BuildSlave(buildmaster_host, port, slavename, passwd, basedir, - keepalive, usepty, umask=umask, maxdelay=maxdelay) -s.setServiceParent(application) diff --git a/scripts/README b/worker/README similarity index 100% rename from scripts/README rename to worker/README diff --git a/scripts/build_reactos b/worker/build_reactos similarity index 100% rename from scripts/build_reactos rename to worker/build_reactos diff --git a/worker/buildbot.tac b/worker/buildbot.tac new file mode 100644 index 0000000..9db62d5 --- /dev/null +++ b/worker/buildbot.tac @@ -0,0 +1,42 @@ + +import os + +from buildbot_worker.bot import Worker +from twisted.application import service + +basedir = '/srv/buildbot/worker_data' +rotateLength = 10000000 +maxRotatedFiles = 10 + +# if this is a relocatable tac file, get the directory containing the TAC +if basedir == '.': + import os.path + basedir = os.path.abspath(os.path.dirname(__file__)) + +# note: this line is matched against to check that this is a worker +# directory; do not edit it. +application = service.Application('buildbot-worker') + +from twisted.python.logfile import LogFile +from twisted.python.log import ILogObserver, FileLogObserver +logfile = LogFile.fromFullPath( + os.path.join(basedir, "twistd.log"), rotateLength=rotateLength, + maxRotatedFiles=maxRotatedFiles) +application.setComponent(ILogObserver, FileLogObserver(logfile).emit) + +buildmaster_host = 'build.reactos.org' +port = 9989 +workername = 'WORKERNAME_HERE' +passwd = 'PASSWORD_HERE' +keepalive = 600 +umask = None +maxdelay = 300 +numcpus = None +allow_shutdown = None +maxretries = None + +s = Worker(buildmaster_host, port, workername, passwd, basedir, + keepalive, umask=umask, maxdelay=maxdelay, + numcpus=numcpus, allow_shutdown=allow_shutdown, + maxRetries=maxretries) +s.setServiceParent(application) diff --git a/scripts/clean b/worker/clean similarity index 100% rename from scripts/clean rename to worker/clean diff --git a/scripts/config.inc b/worker/config.inc similarity index 100% rename from scripts/config.inc rename to worker/config.inc diff --git a/scripts/configure b/worker/configure similarity index 100% rename from scripts/configure rename to worker/configure diff --git a/scripts/configure_msvc b/worker/configure_msvc similarity index 100% rename from scripts/configure_msvc rename to worker/configure_msvc diff --git a/scripts/get_suffix b/worker/get_suffix similarity index 100% rename from scripts/get_suffix rename to worker/get_suffix diff --git a/scripts/prepare_ahk b/worker/prepare_ahk similarity index 100% rename from scripts/prepare_ahk rename to worker/prepare_ahk diff --git a/scripts/prepare_source b/worker/prepare_source similarity index 100% rename from scripts/prepare_source rename to worker/prepare_source diff --git a/scripts/reactos.xml.template b/worker/reactos.xml.template similarity index 100% rename from scripts/reactos.xml.template rename to worker/reactos.xml.template diff --git a/scripts/regtest b/worker/regtest similarity index 100% rename from scripts/regtest rename to worker/regtest diff --git a/scripts/regtestcd b/worker/regtestcd similarity index 100% rename from scripts/regtestcd rename to worker/regtestcd diff --git a/worker/requirements.txt b/worker/requirements.txt new file mode 100644 index 0000000..9544943 --- /dev/null +++ b/worker/requirements.txt @@ -0,0 +1 @@ +buildbot-worker==2.3.1 diff --git a/scripts/run_tests b/worker/run_tests similarity index 100% rename from scripts/run_tests rename to worker/run_tests diff --git a/scripts/submit_result b/worker/submit_result similarity index 100% rename from scripts/submit_result rename to worker/submit_result diff --git a/scripts/sysreg.xml.template b/worker/sysreg.xml.template similarity index 100% rename from scripts/sysreg.xml.template rename to worker/sysreg.xml.template diff --git a/scripts/time b/worker/time similarity index 100% rename from scripts/time rename to worker/time diff --git a/scripts/uploadiso b/worker/uploadiso similarity index 100% rename from scripts/uploadiso rename to worker/uploadiso diff --git a/scripts/vbox_clean b/worker/vbox_clean similarity index 100% rename from scripts/vbox_clean rename to worker/vbox_clean diff --git a/scripts/vmware_clean b/worker/vmware_clean similarity index 100% rename from scripts/vmware_clean rename to worker/vmware_clean