Revert "builders.py: Fix invalid option"

This reverts commit 85cd275481.
This commit is contained in:
Richard Purdie 2018-09-05 20:48:32 +01:00
parent 24085f2a34
commit b1d2a6b8fb
3 changed files with 10 additions and 10 deletions

View File

@ -14,8 +14,8 @@ maxsteps = 8
# Environment to pass into the workers, e.g. to load further local configuration # Environment to pass into the workers, e.g. to load further local configuration
# fragments # fragments
#extra_env = {} extra_env = {}
extra_env = {"ABHELPER_JSON" : "config.json /home/pokybuild/config-local.json"} #extra_env = {"ABHELPER_JSON" : "config.json /home/pokybuild/config-local.json"}
@util.renderer @util.renderer
def get_sstate_release_number(props): def get_sstate_release_number(props):
@ -139,7 +139,7 @@ def create_builder_factory():
haltOnFailure=True, haltOnFailure=True,
name="Clobber build dir")) name="Clobber build dir"))
f.addStep(steps.Git( f.addStep(steps.Git(
repourl='file:///home/pokybuild/yocto-autobuilder-helper', repourl='git://git.yoctoproject.org/yocto-autobuilder-helper',
workdir=util.Interpolate("%(prop:builddir)s/yocto-autobuilder-helper"), workdir=util.Interpolate("%(prop:builddir)s/yocto-autobuilder-helper"),
mode='incremental', mode='incremental',
haltOnFailure=True, haltOnFailure=True,

View File

@ -60,8 +60,8 @@ releases = ["", "sumo", "rocko", "pyro", "morty"]
# ## Cluster configuration # ## Cluster configuration
# Publishing settings # Publishing settings
sharedrepodir = "/home/pokybuild/shareddir/repos.yoctoproject.org" sharedrepodir = "/srv/www/vhosts/repos.yoctoproject.org"
publish_dest = "/home/pokybuild/shareddir/pub" publish_dest = "/srv/www/vhosts/autobuilder.yoctoproject.org/pub"
# Web UI settings # Web UI settings
web_port = 8010 web_port = 8010
@ -72,12 +72,12 @@ workers = ["example-worker"]
# Worker configuration, all workers configured the same... # Worker configuration, all workers configured the same...
# TODO: support per-worker config # TODO: support per-worker config
worker_password = "pass" worker_password = "pass"
worker_max_builds = 3 worker_max_builds = None
notify_on_missing = None notify_on_missing = None
# Some builders should only run on specific workers (host OS dependent) # Some builders should only run on specific workers (host OS dependent)
builder_to_workers = { builder_to_workers = {
"nightly-rpm-non-rpm": ["example-worker"], "nightly-rpm-non-rpm": [],
"nightly-deb-non-deb": ["example-worker"], "nightly-deb-non-deb": [],
"default": workers "default": workers
} }

View File

@ -78,6 +78,6 @@ c['www'] = www.www
c['workers'] = workers.workers c['workers'] = workers.workers
c['title'] = "Yocto Autobuilder" c['title'] = "Yocto Autobuilder"
c['titleURL'] = "http://192.168.1.69:8010/" c['titleURL'] = "https://autobuilder.yoctoproject.org/main/"
# visible location for internal web server # visible location for internal web server
c['buildbotURL'] = "http://192.168.1.69:8010/" c['buildbotURL'] = "https://autobuilder.yoctoproject.org/main/"