Il 13/gen/2014 18:18 "Klaus Aehlig" <[email protected]> ha scritto: > > ...as this is the most useful way to debug an error found > in a QA run. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > .../files/etc/apache2/sites-available/buildbot | 2 +- > .../files/srv/buildbot/masters/ganeti/master.cfg | 29 ++++++++++++++++++++-- > roles/buildmaster/files/var/www/index.html | 13 ++++++++++ > 3 files changed, 41 insertions(+), 3 deletions(-) > create mode 100644 roles/buildmaster/files/var/www/index.html > > diff --git a/roles/buildmaster/files/etc/apache2/sites-available/buildbot b/roles/buildmaster/files/etc/apache2/sites-available/buildbot > index 9b74324..e9527bf 100644 > --- a/roles/buildmaster/files/etc/apache2/sites-available/buildbot > +++ b/roles/buildmaster/files/etc/apache2/sites-available/buildbot > @@ -32,7 +32,7 @@ > Order deny,allow > Allow from all > </Proxy> > - ProxyPass / http://127.0.0.1:8010/ retry=0 > + ProxyPass /ganeti/ http://127.0.0.1:8010/ retry=0 > </IfModule> > > ErrorLog ${APACHE_LOG_DIR}/error.log > diff --git a/roles/buildmaster/files/srv/buildbot/masters/ganeti/master.cfg b/roles/buildmaster/files/srv/buildbot/masters/ganeti/master.cfg > index 43b666a..bd03101 100644 > --- a/roles/buildmaster/files/srv/buildbot/masters/ganeti/master.cfg > +++ b/roles/buildmaster/files/srv/buildbot/masters/ganeti/master.cfg > @@ -250,6 +250,32 @@ def MakeCleanupSteps(hostname, master_ip, master_netdev, remove_sources): > > return steps > > + > +def GenerateLogCollection(machines): > + return [ > + ShellCommand(command=["./collect-logs", "buildlogs.tar.xz"] + machines, > + name="collect-logs", > + description=["collecting logs"], > + descriptionDone="collected logs", > + want_stderr=True, > + haltOnFailure=False, > + alwaysRun=True, > + usePTY=False), > + MasterShellCommand(command=WithProperties("umask 0022 &&" > + " mkdir -p -m 0755 %(logdir)s"), > + name="mklogdir", > + description=["creating", "log", "directory"], > + descriptionDone=["created", "log", "directory"], > + usePTY=False), > + FileUpload(slavesrc="buildlogs.tar.xz", > + masterdest=WithProperties("%(logdir)s/data.tar.xz"), > + mode=0644, > + name="upload-logs", > + haltOnFailure=False, > + alwaysRun=True), > + ] > + > + > def GenerateRunQA(fn): > (workdir, env, cmd) = fn() > > @@ -302,8 +328,7 @@ def MakeQaSteps(mode, machines, master_ip, master_netdev, config_download_fn, > steps.extend(upload_fn(machines)) > > steps.append(GenerateRunQA(qa_cmd_fn)) > - # Don't collect QA logs (yet) > - # steps.extend(GenerateLogCollection(machines)) > + steps.extend(GenerateLogCollection(machines)) > steps.append(GenerateResetPerms(False)) > > return steps > diff --git a/roles/buildmaster/files/var/www/index.html b/roles/buildmaster/files/var/www/index.html > new file mode 100644 > index 0000000..96d9fe0 > --- /dev/null > +++ b/roles/buildmaster/files/var/www/index.html > @@ -0,0 +1,13 @@ > +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> > +<html> > + <head> > + <title>Ganeti buildbot</title> > + </head> > + > + <body> > + <h1>Ganeti buildbot</h1> > + > + <a href="ganeti/tgrid?length=25">Ganeti continous build</a> > + </body> > +</html> > + > -- > 1.8.5.1 >
LGTM, Thanks Michele
