Mercurial > bitten > bitten-test
annotate bitten/web_ui.py @ 812:29a5793c452a
Don't sort revisions received from Trac - they are already sorted chronologically, and no further order can be implied from revision numbers.
Fixes #503. Thanks to Felix Schwarz for patch (with unittest).
author | osimons |
---|---|
date | Wed, 15 Sep 2010 10:49:56 +0000 |
parents | 4c73a3cea9f5 |
children | 77ff2e80b69d |
rev | line source |
---|---|
379 | 1 # -*- coding: utf-8 -*- |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
2 # |
408
933105ab516b
Update file headers and other stuff pointing to the old home.
cmlenz
parents:
391
diff
changeset
|
3 # Copyright (C) 2005-2007 Christopher Lenz <cmlenz@gmx.de> |
933105ab516b
Update file headers and other stuff pointing to the old home.
cmlenz
parents:
391
diff
changeset
|
4 # Copyright (C) 2007 Edgewall Software |
163 | 5 # All rights reserved. |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
6 # |
163 | 7 # This software is licensed as described in the file COPYING, which |
8 # you should have received as part of this distribution. The terms | |
408
933105ab516b
Update file headers and other stuff pointing to the old home.
cmlenz
parents:
391
diff
changeset
|
9 # are also available at http://bitten.edgewall.org/wiki/License. |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
10 |
316 | 11 """Implementation of the Bitten web interface.""" |
12 | |
605
c94481bc4646
0.6dev: Reverting [677] as many of these paths are also used for URLs, and hadn't considered this change enough. No major point in changing code that already works well, so simply reverting seems the best idea...
osimons
parents:
603
diff
changeset
|
13 import posixpath |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
14 import re |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
15 import time |
250 | 16 from StringIO import StringIO |
756 | 17 from datetime import datetime |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
18 |
99
efc1eed69ba8
Make Bitten deployable in Trac as a [http://peak.telecommunity.com/DevCenter/PythonEggs Python egg].
cmlenz
parents:
98
diff
changeset
|
19 import pkg_resources |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
20 from genshi.builder import tag |
745
91aabd647610
Delete attachments when builds are cancelled/invalidated.
wbell
parents:
723
diff
changeset
|
21 from trac.attachment import AttachmentModule, Attachment |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
22 from trac.core import * |
629
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
23 from trac.mimeview.api import Context |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
24 from trac.resource import Resource |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
25 from trac.timeline import ITimelineEventProvider |
321 | 26 from trac.util import escape, pretty_timedelta, format_datetime, shorten_line, \ |
723
278c0ddb5c58
Trac 0.12 compat following `prevnext_nav()` changes, fixing #450.
osimons
parents:
712
diff
changeset
|
27 Markup, arity |
585
87de4513bfdd
0.6dev: Cleaning remaining 'frontend' datetime code - at least down to all code that interface with the various `model` classes that still only works with timestamps for input and output. See #85.
osimons
parents:
583
diff
changeset
|
28 from trac.util.datefmt import to_timestamp, to_datetime, utc |
439 | 29 from trac.util.html import html |
571
bed75f6c3e57
0.6dev: Raise regular `HTTPNotFound` (404) if build or configuration is not found (instead of raising ?ttributeError` error with traceback).
osimons
parents:
562
diff
changeset
|
30 from trac.web import IRequestHandler, IRequestFilter, HTTPNotFound |
74
1d4fa4c32afa
Add template and static resources, hooked up using the new {{{ITemplateProvider}}} extension point in Trac.
cmlenz
parents:
73
diff
changeset
|
31 from trac.web.chrome import INavigationContributor, ITemplateProvider, \ |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
32 add_link, add_stylesheet, add_ctxtnav, \ |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
33 prevnext_nav, add_script |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
34 from trac.wiki import wiki_to_html, wiki_to_oneliner |
410
7930cdd83d13
More restructuring: got rid of the `trac_ext` subpackage, which makes no sense now that the master is also coupled to Trac.
cmlenz
parents:
409
diff
changeset
|
35 from bitten.api import ILogFormatter, IReportChartGenerator, IReportSummarizer |
557
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
36 from bitten.master import BuildMaster |
203
e6ddca1e5712
Huge refactoring to remove dependency on BDB XML. Report data is now stored in the Trac database (SQLite/PostgreSQL).
cmlenz
parents:
200
diff
changeset
|
37 from bitten.model import BuildConfig, TargetPlatform, Build, BuildStep, \ |
e6ddca1e5712
Huge refactoring to remove dependency on BDB XML. Report data is now stored in the Trac database (SQLite/PostgreSQL).
cmlenz
parents:
200
diff
changeset
|
38 BuildLog, Report |
228
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
39 from bitten.queue import collect_changes |
779
d29499a4450c
Copy trac's `trac.util.presentation.to_json` method to prevent `json` module requirement, and incorporate fallback methods to support Trac 0.11 etc. See #426
dfraser
parents:
768
diff
changeset
|
40 from bitten.util import json |
114
ecc062d4fd55
Paths to files and directories in the build log output are rendered as links to the repository browser.
cmlenz
parents:
112
diff
changeset
|
41 |
255
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
42 _status_label = {Build.PENDING: 'pending', |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
43 Build.IN_PROGRESS: 'in progress', |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
44 Build.SUCCESS: 'completed', |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
45 Build.FAILURE: 'failed'} |
506
be811cb659b7
* Renamed `status2title` to `_status_title` and made it a global variable alongside `_status_label`
dfraser
parents:
504
diff
changeset
|
46 _status_title = {Build.PENDING: 'Pending', |
be811cb659b7
* Renamed `status2title` to `_status_title` and made it a global variable alongside `_status_label`
dfraser
parents:
504
diff
changeset
|
47 Build.IN_PROGRESS: 'In Progress', |
be811cb659b7
* Renamed `status2title` to `_status_title` and made it a global variable alongside `_status_label`
dfraser
parents:
504
diff
changeset
|
48 Build.SUCCESS: 'Success', |
be811cb659b7
* Renamed `status2title` to `_status_title` and made it a global variable alongside `_status_label`
dfraser
parents:
504
diff
changeset
|
49 Build.FAILURE: 'Failure'} |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
50 _step_status_label = {BuildStep.SUCCESS: 'success', |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
51 BuildStep.FAILURE: 'failed', |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
52 BuildStep.IN_PROGRESS: 'in progress'} |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
53 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
54 def _get_build_data(env, req, build): |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
55 data = {'id': build.id, 'name': build.slave, 'rev': build.rev, |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
56 'status': _status_label[build.status], |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
57 'cls': _status_label[build.status].replace(' ', '-'), |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
58 'href': req.href.build(build.config, build.id), |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
59 'chgset_href': req.href.changeset(build.rev)} |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
60 if build.started: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
61 data['started'] = format_datetime(build.started) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
62 data['started_delta'] = pretty_timedelta(build.started) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
63 data['duration'] = pretty_timedelta(build.started) |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
64 if build.stopped: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
65 data['stopped'] = format_datetime(build.stopped) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
66 data['stopped_delta'] = pretty_timedelta(build.stopped) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
67 data['duration'] = pretty_timedelta(build.stopped, build.started) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
68 data['slave'] = { |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
69 'name': build.slave, |
250 | 70 'ipnr': build.slave_info.get(Build.IP_ADDRESS), |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
71 'os_name': build.slave_info.get(Build.OS_NAME), |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
72 'os_family': build.slave_info.get(Build.OS_FAMILY), |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
73 'os_version': build.slave_info.get(Build.OS_VERSION), |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
74 'machine': build.slave_info.get(Build.MACHINE), |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
75 'processor': build.slave_info.get(Build.PROCESSOR) |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
76 } |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
77 return data |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
78 |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
79 def _has_permission(repos, path, perm, raise_error=False): |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
80 if hasattr(repos, 'authz'): |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
81 if not repos.authz.has_permission(path): |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
82 if not raise_error: |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
83 return False |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
84 repos.authz.assert_permission(path) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
85 else: |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
86 node = repos.get_node(path) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
87 if not node.can_view(perm): |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
88 if not raise_error: |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
89 return False |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
90 from trac.perm import PermissionError |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
91 raise PermissionError('BROWSER_VIEW', node.resource) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
92 return True |
318 | 93 |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
94 class BittenChrome(Component): |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
95 """Provides the Bitten templates and static resources.""" |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
96 |
320 | 97 implements(INavigationContributor, ITemplateProvider) |
64 | 98 |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
99 # INavigationContributor methods |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
100 |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
101 def get_active_navigation_item(self, req): |
590
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
102 pass |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
103 |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
104 def get_navigation_items(self, req): |
316 | 105 """Return the navigation item for access the build status overview from |
106 the Trac navigation bar.""" | |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
107 if 'BUILD_VIEW' in req.perm: |
557
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
108 status = '' |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
109 if BuildMaster(self.env).quick_status: |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
110 repos = self.env.get_repository(authname=req.authname) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
111 assert repos, 'No "(default)" Repository: Add a repository ' \ |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
112 'or alias named "(default)" to Trac.' |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
113 for config in BuildConfig.select(self.env, |
557
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
114 include_inactive=False): |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
115 prev_rev = None |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
116 for platform, rev, build in collect_changes(repos, config): |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
117 if rev != prev_rev: |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
118 if prev_rev is not None: |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
119 break |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
120 prev_rev = rev |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
121 if build: |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
122 build_data = _get_build_data(self.env, req, build) |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
123 if build_data['status'] == 'failed': |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
124 status='bittenfailed' |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
125 break |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
126 if build_data['status'] == 'in progress': |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
127 status='bitteninprogress' |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
128 elif not status: |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
129 if (build_data['status'] == 'completed'): |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
130 status='bittencompleted' |
557
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
131 if not status: |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
132 status='bittenpending' |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
133 yield ('mainnav', 'build', |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
134 tag.a('Build Status', href=req.href.build(), accesskey=5, |
557
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
135 class_=status)) |
320 | 136 |
137 # ITemplatesProvider methods | |
138 | |
139 def get_htdocs_dirs(self): | |
140 """Return the directories containing static resources.""" | |
141 return [('bitten', pkg_resources.resource_filename(__name__, 'htdocs'))] | |
142 | |
143 def get_templates_dirs(self): | |
144 """Return the directories containing templates.""" | |
145 return [pkg_resources.resource_filename(__name__, 'templates')] | |
146 | |
147 | |
148 class BuildConfigController(Component): | |
149 """Implements the web interface for build configurations.""" | |
150 | |
590
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
151 implements(IRequestHandler, IRequestFilter, INavigationContributor) |
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
152 |
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
153 # INavigationContributor methods |
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
154 |
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
155 def get_active_navigation_item(self, req): |
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
156 return 'build' |
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
157 |
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
158 def get_navigation_items(self, req): |
1e01ab1acd60
0.6dev: Fix highlighting for active navigation. Closes #343.
osimons
parents:
585
diff
changeset
|
159 return [] |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
160 |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
161 # IRequestHandler methods |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
162 |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
163 def match_request(self, req): |
184
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
164 match = re.match(r'/build(?:/([\w.-]+))?/?$', req.path_info) |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
165 if match: |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
166 if match.group(1): |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
167 req.args['config'] = match.group(1) |
35
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
168 return True |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
169 |
67631e1d4d45
Some stubbed out code for the Bitten/Trac-integration. This creates a {{{bitten_build}}} table on database upgrade after the plugin is enabled.
cmlenz
parents:
diff
changeset
|
170 def process_request(self, req): |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
171 req.perm.require('BUILD_VIEW') |
50
0d5ad32948b7
Restrict access to web interface with custom permission actions.
cmlenz
parents:
47
diff
changeset
|
172 |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
173 action = req.args.get('action') |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
174 view = req.args.get('view') |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
175 config = req.args.get('config') |
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
176 |
436
cfbc9ee622d5
Finish the move of build configuration management into the admin interface.
cmlenz
parents:
423
diff
changeset
|
177 if config: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
178 data = self._render_config(req, config) |
436
cfbc9ee622d5
Finish the move of build configuration management into the admin interface.
cmlenz
parents:
423
diff
changeset
|
179 elif view == 'inprogress': |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
180 data = self._render_inprogress(req) |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
181 else: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
182 data = self._render_overview(req) |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
183 |
164
a9cddfae3c09
Adapt to Trac [http://projects.edgewall.com/trac/changeset/2132 r2132].
cmlenz
parents:
163
diff
changeset
|
184 add_stylesheet(req, 'bitten/bitten.css') |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
185 return 'bitten_config.html', data, None |
64 | 186 |
557
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
187 # IRequestHandler methods |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
188 |
557
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
189 def pre_process_request(self, req, handler): |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
190 return handler |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
191 |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
192 def post_process_request(self, req, template, data, content_type): |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
193 if template: |
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
194 add_stylesheet(req, 'bitten/bitten.css') |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
195 |
557
b4d3d9cbf200
Alter the appearance of the ''Build Status'' button, to show the current build status [eblot] - fixes #373
dfraser
parents:
528
diff
changeset
|
196 return template, data, content_type |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
197 |
64 | 198 # Internal methods |
199 | |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
200 def _render_overview(self, req): |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
201 data = {'title': 'Build Status'} |
209
d2b9c72e9643
Hide deactivated build configurations on the build status page by default, and provide an option panel to make them visible.
cmlenz
parents:
203
diff
changeset
|
202 show_all = False |
d2b9c72e9643
Hide deactivated build configurations on the build status page by default, and provide an option panel to make them visible.
cmlenz
parents:
203
diff
changeset
|
203 if req.args.get('show') == 'all': |
d2b9c72e9643
Hide deactivated build configurations on the build status page by default, and provide an option panel to make them visible.
cmlenz
parents:
203
diff
changeset
|
204 show_all = True |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
205 data['show_all'] = show_all |
209
d2b9c72e9643
Hide deactivated build configurations on the build status page by default, and provide an option panel to make them visible.
cmlenz
parents:
203
diff
changeset
|
206 |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
207 repos = self.env.get_repository(authname=req.authname) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
208 assert repos, 'No "(default)" Repository: Add a repository or alias ' \ |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
209 'named "(default)" to Trac.' |
562
a8c84285e67a
Complete rights restrictions for build configs etc - see #384. Also enhance tests to work with this code (but don't yet check that rights are restricted properly)
dfraser
parents:
561
diff
changeset
|
210 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
211 configs = [] |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
212 for config in BuildConfig.select(self.env, include_inactive=show_all): |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
213 if not _has_permission(repos, config.path, req.perm): |
561
8ffe90404a8c
hide build configurations that user does not have rights to access in repository (silk) - fixes #384
dfraser
parents:
557
diff
changeset
|
214 continue |
8ffe90404a8c
hide build configurations that user does not have rights to access in repository (silk) - fixes #384
dfraser
parents:
557
diff
changeset
|
215 |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
216 description = config.description |
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
217 if description: |
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
218 description = wiki_to_html(description, self.env, req) |
504 | 219 |
220 platforms_data = [] | |
221 for platform in TargetPlatform.select(self.env, config=config.name): | |
222 pd = { 'name': platform.name, | |
223 'id': platform.id, | |
591
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
224 'builds_pending': len(list(Build.select(self.env, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
225 config=config.name, status=Build.PENDING, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
226 platform=platform.id))), |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
227 'builds_inprogress': len(list(Build.select(self.env, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
228 config=config.name, status=Build.IN_PROGRESS, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
229 platform=platform.id))) |
504 | 230 } |
231 platforms_data.append(pd) | |
591
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
232 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
233 config_data = { |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
234 'name': config.name, 'label': config.label or config.name, |
209
d2b9c72e9643
Hide deactivated build configurations on the build status page by default, and provide an option panel to make them visible.
cmlenz
parents:
203
diff
changeset
|
235 'active': config.active, 'path': config.path, |
d2b9c72e9643
Hide deactivated build configurations on the build status page by default, and provide an option panel to make them visible.
cmlenz
parents:
203
diff
changeset
|
236 'description': description, |
591
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
237 'builds_pending' : len(list(Build.select(self.env, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
238 config=config.name, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
239 status=Build.PENDING))), |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
240 'builds_inprogress' : len(list(Build.select(self.env, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
241 config=config.name, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
242 status=Build.IN_PROGRESS))), |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
243 'href': req.href.build(config.name), |
504 | 244 'builds': [], |
245 'platforms': platforms_data | |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
246 } |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
247 configs.append(config_data) |
255
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
248 if not config.active: |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
249 continue |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
250 |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
251 prev_rev = None |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
252 for platform, rev, build in collect_changes(repos, config): |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
253 if rev != prev_rev: |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
254 if prev_rev is None: |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
255 chgset = repos.get_changeset(rev) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
256 config_data['youngest_rev'] = { |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
257 'id': rev, 'href': req.href.changeset(rev), |
320 | 258 'author': chgset.author or 'anonymous', |
255
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
259 'date': format_datetime(chgset.date), |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
260 'message': wiki_to_oneliner( |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
261 shorten_line(chgset.message), self.env, req=req) |
255
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
262 } |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
263 else: |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
264 break |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
265 prev_rev = rev |
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
266 if build: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
267 build_data = _get_build_data(self.env, req, build) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
268 build_data['platform'] = platform.name |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
269 config_data['builds'].append(build_data) |
256
aa942e2c7243
A bit of polishing for [265]: also show build if not yet in the queue, some layout improvements.
cmlenz
parents:
255
diff
changeset
|
270 else: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
271 config_data['builds'].append({ |
320 | 272 'platform': platform.name, 'status': 'pending' |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
273 }) |
255
42f555e1d648
Show the build status for the latest changeset for every build configuration on the main build status page. Closes #21.
cmlenz
parents:
250
diff
changeset
|
274 |
746
7f698d867321
Sort the list of configurations on the configuration page.
wbell
parents:
745
diff
changeset
|
275 data['configs'] = sorted(configs, key=lambda x:x['label'].lower()) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
276 data['page_mode'] = 'overview' |
504 | 277 |
278 in_progress_builds = Build.select(self.env, status=Build.IN_PROGRESS) | |
279 pending_builds = Build.select(self.env, status=Build.PENDING) | |
280 | |
591
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
281 data['builds_pending'] = len(list(pending_builds)) |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
282 data['builds_inprogress'] = len(list(in_progress_builds)) |
504 | 283 |
436
cfbc9ee622d5
Finish the move of build configuration management into the admin interface.
cmlenz
parents:
423
diff
changeset
|
284 add_link(req, 'views', req.href.build(view='inprogress'), |
cfbc9ee622d5
Finish the move of build configuration management into the admin interface.
cmlenz
parents:
423
diff
changeset
|
285 'In Progress Builds') |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
286 add_ctxtnav(req, 'In Progress Builds', |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
287 req.href.build(view='inprogress')) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
288 return data |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
289 |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
290 def _render_inprogress(self, req): |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
291 data = {'title': 'In Progress Builds', |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
292 'page_mode': 'view-inprogress'} |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
293 |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
294 db = self.env.get_db_cnx() |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
295 |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
296 repos = self.env.get_repository(authname=req.authname) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
297 assert repos, 'No "(default)" Repository: Add a repository or alias ' \ |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
298 'named "(default)" to Trac.' |
562
a8c84285e67a
Complete rights restrictions for build configs etc - see #384. Also enhance tests to work with this code (but don't yet check that rights are restricted properly)
dfraser
parents:
561
diff
changeset
|
299 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
300 configs = [] |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
301 for config in BuildConfig.select(self.env, include_inactive=False): |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
302 if not _has_permission(repos, config.path, req.perm): |
562
a8c84285e67a
Complete rights restrictions for build configs etc - see #384. Also enhance tests to work with this code (but don't yet check that rights are restricted properly)
dfraser
parents:
561
diff
changeset
|
303 continue |
a8c84285e67a
Complete rights restrictions for build configs etc - see #384. Also enhance tests to work with this code (but don't yet check that rights are restricted properly)
dfraser
parents:
561
diff
changeset
|
304 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
305 self.log.debug(config.name) |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
306 if not config.active: |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
307 continue |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
308 |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
309 in_progress_builds = Build.select(self.env, config=config.name, |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
310 status=Build.IN_PROGRESS, db=db) |
437
6d5ac24061dc
Fix build queue population compatiblity with Trac 0.11, where revision timestamps are `datetime` objects.
cmlenz
parents:
436
diff
changeset
|
311 |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
312 current_builds = 0 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
313 builds = [] |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
314 # sort correctly by revision. |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
315 for build in sorted(in_progress_builds, |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
316 cmp=lambda x, y: int(y.rev) - int(x.rev)): |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
317 rev = build.rev |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
318 build_data = _get_build_data(self.env, req, build) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
319 build_data['rev'] = rev |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
320 build_data['rev_href'] = req.href.changeset(rev) |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
321 platform = TargetPlatform.fetch(self.env, build.platform) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
322 build_data['platform'] = platform.name |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
323 build_data['steps'] = [] |
437
6d5ac24061dc
Fix build queue population compatiblity with Trac 0.11, where revision timestamps are `datetime` objects.
cmlenz
parents:
436
diff
changeset
|
324 |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
325 for step in BuildStep.select(self.env, build=build.id, db=db): |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
326 build_data['steps'].append({ |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
327 'name': step.name, |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
328 'description': step.description, |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
329 'duration': to_datetime(step.stopped or int(time.time()), utc) - \ |
585
87de4513bfdd
0.6dev: Cleaning remaining 'frontend' datetime code - at least down to all code that interface with the various `model` classes that still only works with timestamps for input and output. See #85.
osimons
parents:
583
diff
changeset
|
330 to_datetime(step.started, utc), |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
331 'status': _step_status_label[step.status], |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
332 'cls': _step_status_label[step.status].replace(' ', '-'), |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
333 'errors': step.errors, |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
334 'href': build_data['href'] + '#step_' + step.name |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
335 }) |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
336 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
337 builds.append(build_data) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
338 current_builds += 1 |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
339 |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
340 if current_builds == 0: |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
341 continue |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
342 |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
343 description = config.description |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
344 if description: |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
345 description = wiki_to_html(description, self.env, req) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
346 configs.append({ |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
347 'name': config.name, 'label': config.label or config.name, |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
348 'active': config.active, 'path': config.path, |
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
349 'description': description, |
460
32b61f031df0
Fix a couple of left-over instances of using `env.href` instead of `req.href`. Closes #186. Thanks to Markus Heberling for reporting the issue and providing a patch.
cmlenz
parents:
440
diff
changeset
|
350 'href': req.href.build(config.name), |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
351 'builds': builds |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
352 }) |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
353 |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
354 data['configs'] = sorted(configs, key=lambda x:x['label'].lower()) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
355 return data |
381
166dcdb9269e
New In-Progress Builds Page, which lists the current builds that are being processed by slaves. Accessible from the main build page.
wbell
parents:
379
diff
changeset
|
356 |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
357 def _render_config(self, req, config_name): |
250 | 358 db = self.env.get_db_cnx() |
359 | |
360 config = BuildConfig.fetch(self.env, config_name, db=db) | |
571
bed75f6c3e57
0.6dev: Raise regular `HTTPNotFound` (404) if build or configuration is not found (instead of raising ?ttributeError` error with traceback).
osimons
parents:
562
diff
changeset
|
361 if not config: |
bed75f6c3e57
0.6dev: Raise regular `HTTPNotFound` (404) if build or configuration is not found (instead of raising ?ttributeError` error with traceback).
osimons
parents:
562
diff
changeset
|
362 raise HTTPNotFound("Build configuration '%s' does not exist." \ |
bed75f6c3e57
0.6dev: Raise regular `HTTPNotFound` (404) if build or configuration is not found (instead of raising ?ttributeError` error with traceback).
osimons
parents:
562
diff
changeset
|
363 % config_name) |
562
a8c84285e67a
Complete rights restrictions for build configs etc - see #384. Also enhance tests to work with this code (but don't yet check that rights are restricted properly)
dfraser
parents:
561
diff
changeset
|
364 |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
365 repos = self.env.get_repository(authname=req.authname) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
366 assert repos, 'No "(default)" Repository: Add a repository or alias ' \ |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
367 'named "(default)" to Trac.' |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
368 _has_permission(repos, config.path, req.perm, True) |
562
a8c84285e67a
Complete rights restrictions for build configs etc - see #384. Also enhance tests to work with this code (but don't yet check that rights are restricted properly)
dfraser
parents:
561
diff
changeset
|
369 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
370 data = {'title': 'Build Configuration "%s"' \ |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
371 % config.label or config.name, |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
372 'page_mode': 'view_config'} |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
373 add_link(req, 'up', req.href.build(), 'Build Status') |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
374 description = config.description |
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
375 if description: |
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
376 description = wiki_to_html(description, self.env, req) |
504 | 377 |
591
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
378 pending_builds = list(Build.select(self.env, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
379 config=config.name, status=Build.PENDING)) |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
380 inprogress_builds = list(Build.select(self.env, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
381 config=config.name, status=Build.IN_PROGRESS)) |
504 | 382 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
383 data['config'] = { |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
384 'name': config.name, 'label': config.label, 'path': config.path, |
250 | 385 'min_rev': config.min_rev, |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
386 'min_rev_href': req.href.changeset(config.min_rev), |
250 | 387 'max_rev': config.max_rev, |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
388 'max_rev_href': req.href.changeset(config.max_rev), |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
389 'active': config.active, 'description': description, |
504 | 390 'browser_href': req.href.browser(config.path), |
391 'builds_pending' : len(pending_builds), | |
638
74237f60f8a9
0.6dev: Improving builds overview page layout, take 2. Re-closing #430.
osimons
parents:
637
diff
changeset
|
392 'builds_inprogress' : len(inprogress_builds) |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
393 } |
47
083e848088ee
* Improvements to the model classes, and a couple of unit tests.
cmlenz
parents:
45
diff
changeset
|
394 |
629
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
395 context = Context.from_request(req, config.resource) |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
396 data['context'] = context |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
397 data['config']['attachments'] = AttachmentModule(self.env).attachment_data(context) |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
398 |
250 | 399 platforms = list(TargetPlatform.select(self.env, config=config_name, |
400 db=db)) | |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
401 data['config']['platforms'] = [ |
504 | 402 { 'name': platform.name, |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
403 'id': platform.id, |
591
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
404 'builds_pending': len(list(Build.select(self.env, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
405 config=config.name, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
406 status=Build.PENDING, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
407 platform=platform.id))), |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
408 'builds_inprogress': len(list(Build.select(self.env, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
409 config=config.name, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
410 status=Build.IN_PROGRESS, |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
411 platform=platform.id))) |
504 | 412 } |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
413 for platform in platforms |
76
ffa1ffd8c7db
* Implement basic slave selection based on configured target platforms. Closes #15.
cmlenz
parents:
74
diff
changeset
|
414 ] |
74
1d4fa4c32afa
Add template and static resources, hooked up using the new {{{ITemplateProvider}}} extension point in Trac.
cmlenz
parents:
73
diff
changeset
|
415 |
197
d72c0587fae9
* Don't schedule/display builds for revisions where the repository directory is empty. Fixes #46.
cmlenz
parents:
196
diff
changeset
|
416 has_reports = False |
250 | 417 for report in Report.select(self.env, config=config.name, db=db): |
197
d72c0587fae9
* Don't schedule/display builds for revisions where the repository directory is empty. Fixes #46.
cmlenz
parents:
196
diff
changeset
|
418 has_reports = True |
d72c0587fae9
* Don't schedule/display builds for revisions where the repository directory is empty. Fixes #46.
cmlenz
parents:
196
diff
changeset
|
419 break |
d72c0587fae9
* Don't schedule/display builds for revisions where the repository directory is empty. Fixes #46.
cmlenz
parents:
196
diff
changeset
|
420 |
d72c0587fae9
* Don't schedule/display builds for revisions where the repository directory is empty. Fixes #46.
cmlenz
parents:
196
diff
changeset
|
421 if has_reports: |
388
3ba9430a5d87
Fix for hardcoded chart generators in UI. Closes #153.
cmlenz
parents:
382
diff
changeset
|
422 chart_generators = [] |
756 | 423 report_categories = list(self._report_categories_for_config(config)) |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
424 for generator in ReportChartController(self.env).generators: |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
425 for category in generator.get_supported_categories(): |
756 | 426 if category in report_categories: |
427 chart_generators.append({ | |
768 | 428 'href': req.href.build(config.name, 'chart/' + category), |
429 'category': category, | |
756 | 430 }) |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
431 data['config']['charts'] = chart_generators |
178
fcbe107ca755
Add some basic charts to the build status page, based on [http://www.maani.us/xml_charts/index.php XML/SWF Charts]:
cmlenz
parents:
174
diff
changeset
|
432 |
214 | 433 page = max(1, int(req.args.get('page', 1))) |
434 more = False | |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
435 data['page_number'] = page |
214 | 436 |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
437 repos = self.env.get_repository(authname=req.authname) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
438 assert repos, 'No "(default)" Repository: Add a repository or alias ' \ |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
439 'named "(default)" to Trac.' |
360
5bc81e597352
Fix incompatibility with a change to the versioncontrol layer in Trac 0.10.3
cmlenz
parents:
328
diff
changeset
|
440 |
228
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
441 builds_per_page = 12 * len(platforms) |
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
442 idx = 0 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
443 builds = {} |
812
29a5793c452a
Don't sort revisions received from Trac - they are already sorted chronologically, and no further order can be implied from revision numbers.
osimons
parents:
804
diff
changeset
|
444 revisions = [] |
228
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
445 for platform, rev, build in collect_changes(repos, config): |
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
446 if idx >= page * builds_per_page: |
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
447 more = True |
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
448 break |
232
b6e4896dc026
Fix regression introduced in [239]: first build was being skipped on build configuration page.
cmlenz
parents:
230
diff
changeset
|
449 elif idx >= (page - 1) * builds_per_page: |
812
29a5793c452a
Don't sort revisions received from Trac - they are already sorted chronologically, and no further order can be implied from revision numbers.
osimons
parents:
804
diff
changeset
|
450 if rev not in builds: |
29a5793c452a
Don't sort revisions received from Trac - they are already sorted chronologically, and no further order can be implied from revision numbers.
osimons
parents:
804
diff
changeset
|
451 revisions.append(rev) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
452 builds.setdefault(rev, {}) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
453 builds[rev].setdefault('href', req.href.changeset(rev)) |
230 | 454 if build and build.status != Build.PENDING: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
455 build_data = _get_build_data(self.env, req, build) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
456 build_data['steps'] = [] |
250 | 457 for step in BuildStep.select(self.env, build=build.id, |
458 db=db): | |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
459 build_data['steps'].append({ |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
460 'name': step.name, |
320 | 461 'description': step.description, |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
462 'duration': to_datetime(step.stopped or int(time.time()), utc) - \ |
585
87de4513bfdd
0.6dev: Cleaning remaining 'frontend' datetime code - at least down to all code that interface with the various `model` classes that still only works with timestamps for input and output. See #85.
osimons
parents:
583
diff
changeset
|
463 to_datetime(step.started, utc), |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
464 'status': _step_status_label[step.status], |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
465 'cls': _step_status_label[step.status].replace(' ', '-'), |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
466 |
250 | 467 'errors': step.errors, |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
468 'href': build_data['href'] + '#step_' + step.name |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
469 }) |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
470 builds[rev][platform.id] = build_data |
230 | 471 idx += 1 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
472 data['config']['builds'] = builds |
812
29a5793c452a
Don't sort revisions received from Trac - they are already sorted chronologically, and no further order can be implied from revision numbers.
osimons
parents:
804
diff
changeset
|
473 data['config']['revisions'] = revisions |
214 | 474 |
228
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
475 if page > 1: |
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
476 if page == 2: |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
477 prev_href = req.href.build(config.name) |
228
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
478 else: |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
479 prev_href = req.href.build(config.name, page=page - 1) |
228
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
480 add_link(req, 'prev', prev_href, 'Previous Page') |
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
481 if more: |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
482 next_href = req.href.build(config.name, page=page + 1) |
228
a8c9dd7e3f71
* Cleanup and documentation for the `BuildQueue` class added in [236].
cmlenz
parents:
219
diff
changeset
|
483 add_link(req, 'next', next_href, 'Next Page') |
723
278c0ddb5c58
Trac 0.12 compat following `prevnext_nav()` changes, fixing #450.
osimons
parents:
712
diff
changeset
|
484 if arity(prevnext_nav) == 4: # Trac 0.12 compat, see #450 |
278c0ddb5c58
Trac 0.12 compat following `prevnext_nav()` changes, fixing #450.
osimons
parents:
712
diff
changeset
|
485 prevnext_nav(req, 'Previous Page', 'Next Page') |
278c0ddb5c58
Trac 0.12 compat following `prevnext_nav()` changes, fixing #450.
osimons
parents:
712
diff
changeset
|
486 else: |
278c0ddb5c58
Trac 0.12 compat following `prevnext_nav()` changes, fixing #450.
osimons
parents:
712
diff
changeset
|
487 prevnext_nav (req, 'Page') |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
488 return data |
41
16b30ffc5fb9
Add web interface for viewing and managing build configurations. Closes #9.
cmlenz
parents:
35
diff
changeset
|
489 |
756 | 490 def _report_categories_for_config(self, config): |
491 """Yields the categories of reports that exist for active builds | |
492 of this configuration. | |
493 """ | |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
494 |
756 | 495 db = self.env.get_db_cnx() |
496 cursor = db.cursor() | |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
497 |
756 | 498 cursor.execute("""SELECT DISTINCT report.category as category |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
499 FROM bitten_build AS build |
756 | 500 JOIN bitten_report AS report ON (report.build=build.id) |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
501 WHERE build.config=%s AND build.rev_time >= %s AND build.rev_time <= %s""", |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
502 (config.name, |
756 | 503 config.min_rev_time(self.env), |
504 config.max_rev_time(self.env))) | |
505 | |
506 for (category,) in cursor: | |
507 yield category | |
508 | |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
509 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
510 class BuildController(Component): |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
511 """Renders the build page.""" |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
512 implements(INavigationContributor, IRequestHandler, ITimelineEventProvider) |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
513 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
514 log_formatters = ExtensionPoint(ILogFormatter) |
161
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
515 report_summarizers = ExtensionPoint(IReportSummarizer) |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
516 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
517 # INavigationContributor methods |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
518 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
519 def get_active_navigation_item(self, req): |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
520 return 'build' |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
521 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
522 def get_navigation_items(self, req): |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
523 return [] |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
524 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
525 # IRequestHandler methods |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
526 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
527 def match_request(self, req): |
174
79c61c26a4e1
* Changed the `IReportStore` interface to allow querying with [http://www.w3.org/XML/Query/ XQuery]. This should make it possible to efficiently query the report store for any existing metrics.
cmlenz
parents:
168
diff
changeset
|
528 match = re.match(r'/build/([\w.-]+)/(\d+)', req.path_info) |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
529 if match: |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
530 if match.group(1): |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
531 req.args['config'] = match.group(1) |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
532 if match.group(2): |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
533 req.args['id'] = match.group(2) |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
534 return True |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
535 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
536 def process_request(self, req): |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
537 req.perm.require('BUILD_VIEW') |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
538 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
539 db = self.env.get_db_cnx() |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
540 build_id = int(req.args.get('id')) |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
541 build = Build.fetch(self.env, build_id, db=db) |
571
bed75f6c3e57
0.6dev: Raise regular `HTTPNotFound` (404) if build or configuration is not found (instead of raising ?ttributeError` error with traceback).
osimons
parents:
562
diff
changeset
|
542 if not build: |
bed75f6c3e57
0.6dev: Raise regular `HTTPNotFound` (404) if build or configuration is not found (instead of raising ?ttributeError` error with traceback).
osimons
parents:
562
diff
changeset
|
543 raise HTTPNotFound("Build '%s' does not exist." \ |
bed75f6c3e57
0.6dev: Raise regular `HTTPNotFound` (404) if build or configuration is not found (instead of raising ?ttributeError` error with traceback).
osimons
parents:
562
diff
changeset
|
544 % build_id) |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
545 |
184
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
546 if req.method == 'POST': |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
547 if req.args.get('action') == 'invalidate': |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
548 self._do_invalidate(req, build, db) |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
549 req.redirect(req.href.build(build.config, build.id)) |
184
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
550 |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
551 add_link(req, 'up', req.href.build(build.config), |
73
6d7753ea1798
Implemented basic management of target platforms. Closes #14.
cmlenz
parents:
69
diff
changeset
|
552 'Build Configuration') |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
553 data = {'title': 'Build %s - %s' % (build_id, |
506
be811cb659b7
* Renamed `status2title` to `_status_title` and made it a global variable alongside `_status_label`
dfraser
parents:
504
diff
changeset
|
554 _status_title[build.status]), |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
555 'page_mode': 'view_build', |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
556 'build': {}} |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
557 config = BuildConfig.fetch(self.env, build.config, db=db) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
558 data['build']['config'] = { |
583
f916b88926f5
0.6dev: If configuration display label is deleted, no name would show and the build UI would fold across a couple of lines. This should see to it that the configuration always has a name available.
osimons
parents:
571
diff
changeset
|
559 'name': config.label or config.name, |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
560 'href': req.href.build(config.name) |
69 | 561 } |
562 | |
629
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
563 context = Context.from_request(req, build.resource) |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
564 data['context'] = context |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
565 data['build']['attachments'] = AttachmentModule(self.env).attachment_data(context) |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
566 |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
567 formatters = [] |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
568 for formatter in self.log_formatters: |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
569 formatters.append(formatter.get_formatter(req, build)) |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
570 |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
571 summarizers = {} # keyed by report type |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
572 for summarizer in self.report_summarizers: |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
573 categories = summarizer.get_supported_categories() |
423
8864b3917221
Fix for Python 2.3 incompatibility in display for report summaries. Closes #164.
cmlenz
parents:
411
diff
changeset
|
574 summarizers.update(dict([(cat, summarizer) for cat in categories])) |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
575 |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
576 data['build'].update(_get_build_data(self.env, req, build)) |
80
dc1c7fc9b915
Record the output of build steps in the database. See #12. Still need to get better granularity in transmitting the log output from slave to master before #12 can be closed.
cmlenz
parents:
79
diff
changeset
|
577 steps = [] |
112
a38eabd4b6e1
* Store build logs in a structured way, for example to highlight messages on the error stream.
cmlenz
parents:
111
diff
changeset
|
578 for step in BuildStep.select(self.env, build=build.id, db=db): |
80
dc1c7fc9b915
Record the output of build steps in the database. See #12. Still need to get better granularity in transmitting the log output from slave to master before #12 can be closed.
cmlenz
parents:
79
diff
changeset
|
579 steps.append({ |
dc1c7fc9b915
Record the output of build steps in the database. See #12. Still need to get better granularity in transmitting the log output from slave to master before #12 can be closed.
cmlenz
parents:
79
diff
changeset
|
580 'name': step.name, 'description': step.description, |
760
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
581 'duration': pretty_timedelta(step.started, step.stopped or int(time.time())), |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
582 'status': _step_status_label[step.status], |
306419d32527
Expand steps to allow in-progress steps. Some small additions to the BuildStep model, but most changes are in the ui to not assume steps are in their final state when they're shown.
wbell
parents:
756
diff
changeset
|
583 'cls': _step_status_label[step.status].replace(' ', '-'), |
245
a22ec8fce6c9
Store the reason(s) for build step failure in the database.
cmlenz
parents:
232
diff
changeset
|
584 'errors': step.errors, |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
585 'log': self._render_log(req, build, formatters, step), |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
586 'reports': self._render_reports(req, config, build, summarizers, |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
587 step) |
80
dc1c7fc9b915
Record the output of build steps in the database. See #12. Still need to get better granularity in transmitting the log output from slave to master before #12 can be closed.
cmlenz
parents:
79
diff
changeset
|
588 }) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
589 data['build']['steps'] = steps |
592
4848d9b7a3e5
0.6dev: Removing 'Invalidate build' button when the build is 'pending' (and nothing further to really invalidate). See #332.
osimons
parents:
591
diff
changeset
|
590 data['build']['can_delete'] = ('BUILD_DELETE' in req.perm \ |
4848d9b7a3e5
0.6dev: Removing 'Invalidate build' button when the build is 'pending' (and nothing further to really invalidate). See #332.
osimons
parents:
591
diff
changeset
|
591 and build.status != build.PENDING) |
120
b63ed684c29c
Show the list of reports generated on the build page.
cmlenz
parents:
114
diff
changeset
|
592 |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
593 repos = self.env.get_repository(authname=req.authname) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
594 assert repos, 'No "(default)" Repository: Add a repository or alias ' \ |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
595 'named "(default)" to Trac.' |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
596 _has_permission(repos, config.path, req.perm, True) |
250 | 597 chgset = repos.get_changeset(build.rev) |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
598 data['build']['chgset_author'] = chgset.author |
250 | 599 |
636
21902b481ee7
0.6dev: Inline display of error and failure details in 'Test Results' summary table.
osimons
parents:
629
diff
changeset
|
600 add_script(req, 'common/js/folding.js') |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
601 add_script(req, 'bitten/tabset.js') |
768 | 602 add_script(req, 'bitten/jquery.flot.js') |
164
a9cddfae3c09
Adapt to Trac [http://projects.edgewall.com/trac/changeset/2132 r2132].
cmlenz
parents:
163
diff
changeset
|
603 add_stylesheet(req, 'bitten/bitten.css') |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
604 return 'bitten_build.html', data, None |
80
dc1c7fc9b915
Record the output of build steps in the database. See #12. Still need to get better granularity in transmitting the log output from slave to master before #12 can be closed.
cmlenz
parents:
79
diff
changeset
|
605 |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
606 # ITimelineEventProvider methods |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
607 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
608 def get_timeline_filters(self, req): |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
609 if 'BUILD_VIEW' in req.perm: |
141
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
610 yield ('build', 'Builds') |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
611 |
0e21778c04ef
Refactoring: split up the components and templates that render the web interface.
cmlenz
parents:
139
diff
changeset
|
612 def get_timeline_events(self, req, start, stop, filters): |
311 | 613 if 'build' not in filters: |
614 return | |
250 | 615 |
629
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
616 # Attachments (will be rendered by attachment module) |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
617 for event in AttachmentModule(self.env).get_timeline_events( |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
618 req, Resource('build'), start, stop): |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
619 yield event |
f3bb52da9e3c
0.6dev: Adding support for attachments to configurations and build - full web implementation that mirrors what is available in Ticket and Wiki. Also added a new generic `<attach/>` command that enables attaching files to be part of a recipe and uploaded by slaves as part of build.
osimons
parents:
605
diff
changeset
|
620 |
585
87de4513bfdd
0.6dev: Cleaning remaining 'frontend' datetime code - at least down to all code that interface with the various `model` classes that still only works with timestamps for input and output. See #85.
osimons
parents:
583
diff
changeset
|
621 start = to_timestamp(start) |
87de4513bfdd
0.6dev: Cleaning remaining 'frontend' datetime code - at least down to all code that interface with the various `model` classes that still only works with timestamps for input and output. See #85.
osimons
parents:
583
diff
changeset
|
622 stop = to_timestamp(stop) |
382
2078b20186cf
Trac 0.11 compatibility fix in timeline event provider.
cmlenz
parents:
381
diff
changeset
|
623 |
311 | 624 add_stylesheet(req, 'bitten/bitten.css') |
625 | |
626 db = self.env.get_db_cnx() | |
627 cursor = db.cursor() | |
644
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
628 cursor.execute("SELECT b.id,b.config,c.label,c.path, b.rev,p.name," |
311 | 629 "b.stopped,b.status FROM bitten_build AS b" |
630 " INNER JOIN bitten_config AS c ON (c.name=b.config) " | |
631 " INNER JOIN bitten_platform AS p ON (p.id=b.platform) " | |
632 "WHERE b.stopped>=%s AND b.stopped<=%s " | |
633 "AND b.status IN (%s, %s) ORDER BY b.stopped", | |
634 (start, stop, Build.SUCCESS, Build.FAILURE)) | |
635 | |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
636 repos = self.env.get_repository(authname=req.authname) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
637 assert repos, 'No "(default)" Repository: Add a repository or alias ' \ |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
638 'named "(default)" to Trac.' |
562
a8c84285e67a
Complete rights restrictions for build configs etc - see #384. Also enhance tests to work with this code (but don't yet check that rights are restricted properly)
dfraser
parents:
561
diff
changeset
|
639 |
311 | 640 event_kinds = {Build.SUCCESS: 'successbuild', |
641 Build.FAILURE: 'failedbuild'} | |
642 | |
644
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
643 for id_, config, label, path, rev, platform, stopped, status in cursor: |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
644 if not _has_permission(repos, path, req.perm): |
562
a8c84285e67a
Complete rights restrictions for build configs etc - see #384. Also enhance tests to work with this code (but don't yet check that rights are restricted properly)
dfraser
parents:
561
diff
changeset
|
645 continue |
311 | 646 errors = [] |
647 if status == Build.FAILURE: | |
644
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
648 for step in BuildStep.select(self.env, build=id_, |
311 | 649 status=BuildStep.FAILURE, |
650 db=db): | |
320 | 651 errors += [(step.name, error) for error |
311 | 652 in step.errors] |
653 | |
644
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
654 yield (event_kinds[status], to_datetime(stopped, utc), None, |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
655 (id_, config, label, rev, platform, status, errors)) |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
656 |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
657 def render_timeline_event(self, context, field, event): |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
658 id_, config, label, rev, platform, status, errors = event[3] |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
659 |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
660 if field == 'url': |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
661 return context.href.build(config, id_) |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
662 |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
663 elif field == 'title': |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
664 return tag('Build of ', tag.em('%s [%s]' % (label, rev)), |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
665 ' on %s %s' % (platform, _status_label[status])) |
644
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
666 |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
667 elif field == 'description': |
311 | 668 message = '' |
644
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
669 if context.req.args.get('format') == 'rss': |
311 | 670 if errors: |
671 buf = StringIO() | |
672 prev_step = None | |
673 for step, error in errors: | |
674 if step != prev_step: | |
675 if prev_step is not None: | |
676 buf.write('</ul>') | |
321 | 677 buf.write('<p>Step %s failed:</p><ul>' \ |
678 % escape(step)) | |
311 | 679 prev_step = step |
321 | 680 buf.write('<li>%s</li>' % escape(error)) |
311 | 681 buf.write('</ul>') |
320 | 682 message = Markup(buf.getvalue()) |
311 | 683 else: |
684 if errors: | |
685 steps = [] | |
686 for step, error in errors: | |
687 if step not in steps: | |
688 steps.append(step) | |
488 | 689 steps = [Markup('<em>%s</em>') % step for step in steps] |
311 | 690 if len(steps) < 2: |
691 message = steps[0] | |
692 elif len(steps) == 2: | |
320 | 693 message = Markup(' and ').join(steps) |
311 | 694 elif len(steps) > 2: |
320 | 695 message = Markup(', ').join(steps[:-1]) + ', and ' + \ |
311 | 696 steps[-1] |
488 | 697 message = Markup('Step%s %s failed') % ( |
644
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
698 len(steps) != 1 and 's' or '', message) |
9331ab08000f
0.6dev: Switching to use Trac 0.11 Timeline API that is more efficient with regards to cursor usage. See #269.
osimons
parents:
643
diff
changeset
|
699 return message |
114
ecc062d4fd55
Paths to files and directories in the build log output are rendered as links to the repository browser.
cmlenz
parents:
112
diff
changeset
|
700 |
161
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
701 # Internal methods |
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
702 |
184
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
703 def _do_invalidate(self, req, build, db): |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
704 self.log.info('Invalidating build %d', build.id) |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
705 |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
706 for step in BuildStep.select(self.env, build=build.id, db=db): |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
707 step.delete(db=db) |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
708 |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
709 build.slave = None |
762
5f0cfee44540
Add new last_activity field to build. I considered reusing stopped, but this seemed cleaner and more obvious, which seems like the right way to go.
wbell
parents:
760
diff
changeset
|
710 build.started = 0 |
5f0cfee44540
Add new last_activity field to build. I considered reusing stopped, but this seemed cleaner and more obvious, which seems like the right way to go.
wbell
parents:
760
diff
changeset
|
711 build.stopped = 0 |
5f0cfee44540
Add new last_activity field to build. I considered reusing stopped, but this seemed cleaner and more obvious, which seems like the right way to go.
wbell
parents:
760
diff
changeset
|
712 build.last_activity = 0 |
184
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
713 build.status = Build.PENDING |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
714 build.slave_info = {} |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
715 build.update() |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
716 |
745
91aabd647610
Delete attachments when builds are cancelled/invalidated.
wbell
parents:
723
diff
changeset
|
717 Attachment.delete_all(self.env, 'build', build.resource.id, db) |
91aabd647610
Delete attachments when builds are cancelled/invalidated.
wbell
parents:
723
diff
changeset
|
718 |
184
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
719 db.commit() |
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
720 |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
721 req.redirect(req.href.build(build.config)) |
184
fbf949f4c706
Allow invalidation of builds from the web interface. This results in the build being reset to ''PENDING'' status, and all build logs, slave information and reports deleted. Basically initiates a rebuild for a specific revision and target platform.
cmlenz
parents:
182
diff
changeset
|
722 |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
723 def _render_log(self, req, build, formatters, step): |
161
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
724 items = [] |
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
725 for log in BuildLog.select(self.env, build=build.id, step=step.name): |
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
726 for level, message in log.messages: |
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
727 for format in formatters: |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
728 message = format(step, log.generator, level, message) |
161
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
729 items.append({'level': level, 'message': message}) |
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
730 return items |
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
731 |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
732 def _render_reports(self, req, config, build, summarizers, step): |
161
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
733 reports = [] |
203
e6ddca1e5712
Huge refactoring to remove dependency on BDB XML. Report data is now stored in the Trac database (SQLite/PostgreSQL).
cmlenz
parents:
200
diff
changeset
|
734 for report in Report.select(self.env, build=build.id, step=step.name): |
e6ddca1e5712
Huge refactoring to remove dependency on BDB XML. Report data is now stored in the Trac database (SQLite/PostgreSQL).
cmlenz
parents:
200
diff
changeset
|
735 summarizer = summarizers.get(report.category) |
161
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
736 if summarizer: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
737 tmpl, data = summarizer.render_summary(req, config, build, |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
738 step, report.category) |
756 | 739 reports.append({'category': report.category, |
740 'template': tmpl, 'data': data}) | |
161
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
741 else: |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
742 tmpl = data = None |
161
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
743 return reports |
4677161d2ae9
Reports can now be "summarized" on the build results page, with special components rendering summary HTML fragments for specific report types. The summaries are displayed as tabs next to the log of the build step. Currently summarizers for test results and code coverage exist.
cmlenz
parents:
147
diff
changeset
|
744 |
114
ecc062d4fd55
Paths to files and directories in the build log output are rendered as links to the repository browser.
cmlenz
parents:
112
diff
changeset
|
745 |
409
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
746 class ReportChartController(Component): |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
747 implements(IRequestHandler) |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
748 |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
749 generators = ExtensionPoint(IReportChartGenerator) |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
750 |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
751 # IRequestHandler methods |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
752 def match_request(self, req): |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
753 match = re.match(r'/build/([\w.-]+)/chart/(\w+)', req.path_info) |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
754 if match: |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
755 req.args['config'] = match.group(1) |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
756 req.args['category'] = match.group(2) |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
757 return True |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
758 |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
759 def process_request(self, req): |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
760 category = req.args.get('category') |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
761 config = BuildConfig.fetch(self.env, name=req.args.get('config')) |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
762 |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
763 for generator in self.generators: |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
764 if category in generator.get_supported_categories(): |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
765 tmpl, data = generator.generate_chart_data(req, config, |
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
766 category) |
409
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
767 break |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
768 else: |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
769 raise TracError('Unknown report category "%s"' % category) |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
770 |
779
d29499a4450c
Copy trac's `trac.util.presentation.to_json` method to prevent `json` module requirement, and incorporate fallback methods to support Trac 0.11 etc. See #426
dfraser
parents:
768
diff
changeset
|
771 data['dumps'] = json.to_json |
768 | 772 |
773 return tmpl, data, 'text/plain' | |
409
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
774 |
5786700df0c7
Moved/restructured the modules implementing report chart generators and report summarizers.
cmlenz
parents:
408
diff
changeset
|
775 |
114
ecc062d4fd55
Paths to files and directories in the build log output are rendered as links to the repository browser.
cmlenz
parents:
112
diff
changeset
|
776 class SourceFileLinkFormatter(Component): |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
777 """Detects references to files in the build log and renders them as links |
439 | 778 to the repository browser. |
779 """ | |
203
e6ddca1e5712
Huge refactoring to remove dependency on BDB XML. Report data is now stored in the Trac database (SQLite/PostgreSQL).
cmlenz
parents:
200
diff
changeset
|
780 |
114
ecc062d4fd55
Paths to files and directories in the build log output are rendered as links to the repository browser.
cmlenz
parents:
112
diff
changeset
|
781 implements(ILogFormatter) |
ecc062d4fd55
Paths to files and directories in the build log output are rendered as links to the repository browser.
cmlenz
parents:
112
diff
changeset
|
782 |
593
99831ab37fd3
0.6dev: Making source-linking work also for Windows-style file references (as output by Windows slaves). Thanks to Doug Patterson for updated regexp.
osimons
parents:
592
diff
changeset
|
783 _fileref_re = re.compile(r'(?P<prefix>-[A-Za-z])?(?P<path>[\w.-]+(?:[\\/][\w.-]+)+)(?P<line>:\d+)?') |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
784 |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
785 def get_formatter(self, req, build): |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
786 """Return the log message formatter function.""" |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
787 config = BuildConfig.fetch(self.env, name=build.config) |
804
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
788 repos = self.env.get_repository(authname=req.authname) |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
789 assert repos, 'No "(default)" Repository: Add a repository or alias ' \ |
4c73a3cea9f5
Basic Trac 0.12 support, supporting just a `(default)` repository - essentially Trac 0.11 behaviour. Thanks to those that have contributed to #480 to get this working and tested.
osimons
parents:
794
diff
changeset
|
790 'named "(default)" to Trac.' |
376
05c684ceb8c6
Use `req.href` instead of `env.href` as that works much better in Trac>=0.10. That also means Trac 0.9 is no longer supported.
cmlenz
parents:
362
diff
changeset
|
791 href = req.href.browser |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
792 cache = {} |
439 | 793 |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
794 def _replace(m): |
605
c94481bc4646
0.6dev: Reverting [677] as many of these paths are also used for URLs, and hadn't considered this change enough. No major point in changing code that already works well, so simply reverting seems the best idea...
osimons
parents:
603
diff
changeset
|
795 filepath = posixpath.normpath(m.group('path').replace('\\', '/')) |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
796 if not cache.get(filepath) is True: |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
797 parts = filepath.split('/') |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
798 path = '' |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
799 for part in parts: |
605
c94481bc4646
0.6dev: Reverting [677] as many of these paths are also used for URLs, and hadn't considered this change enough. No major point in changing code that already works well, so simply reverting seems the best idea...
osimons
parents:
603
diff
changeset
|
800 path = posixpath.join(path, part) |
439 | 801 if path not in cache: |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
802 try: |
605
c94481bc4646
0.6dev: Reverting [677] as many of these paths are also used for URLs, and hadn't considered this change enough. No major point in changing code that already works well, so simply reverting seems the best idea...
osimons
parents:
603
diff
changeset
|
803 full_path = posixpath.join(config.path, path) |
c94481bc4646
0.6dev: Reverting [677] as many of these paths are also used for URLs, and hadn't considered this change enough. No major point in changing code that already works well, so simply reverting seems the best idea...
osimons
parents:
603
diff
changeset
|
804 full_path = posixpath.normpath(full_path) |
591
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
805 if full_path.startswith(config.path + "/") \ |
87f87c756dca
0.6dev: Just cleaning some tabs + very long code lines in `web_ui.py`.
osimons
parents:
590
diff
changeset
|
806 or full_path == config.path: |
528
f3bf55de8a34
Prevent path highlighting from passing non-canonical paths to svn:
dfraser
parents:
506
diff
changeset
|
807 repos.get_node(full_path, |
f3bf55de8a34
Prevent path highlighting from passing non-canonical paths to svn:
dfraser
parents:
506
diff
changeset
|
808 build.rev) |
f3bf55de8a34
Prevent path highlighting from passing non-canonical paths to svn:
dfraser
parents:
506
diff
changeset
|
809 cache[path] = True |
f3bf55de8a34
Prevent path highlighting from passing non-canonical paths to svn:
dfraser
parents:
506
diff
changeset
|
810 else: |
f3bf55de8a34
Prevent path highlighting from passing non-canonical paths to svn:
dfraser
parents:
506
diff
changeset
|
811 cache[path] = False |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
812 except TracError: |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
813 cache[path] = False |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
814 if cache[path] is False: |
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
815 return m.group(0) |
439 | 816 link = href(config.path, filepath) |
817 if m.group('line'): | |
818 link += '#L' + m.group('line')[1:] | |
503
a7c795920c4a
Merging trac-0.11 branch to trunk. This revision is equivalent to [571].
wbell
parents:
493
diff
changeset
|
819 return Markup(tag.a(m.group(0), href=link)) |
439 | 820 |
258
77cdef044d48
* Improve build log formatter performance: now only matches strings using the `path:line` format, and checks the existance of files in the repository when they are encountered. Should fix (or at least improve) #54.
cmlenz
parents:
256
diff
changeset
|
821 def _formatter(step, type, level, message): |
439 | 822 buf = [] |
823 offset = 0 | |
824 for mo in self._fileref_re.finditer(message): | |
825 start, end = mo.span() | |
826 if start > offset: | |
827 buf.append(message[offset:start]) | |
828 buf.append(_replace(mo)) | |
829 offset = end | |
440
e660687ac89c
Follow-up fix to [486]: trailing chars in auto-linked log messages was getting removed.
cmlenz
parents:
439
diff
changeset
|
830 if offset < len(message): |
439 | 831 buf.append(message[offset:]) |
832 return Markup("").join(buf) | |
833 | |
114
ecc062d4fd55
Paths to files and directories in the build log output are rendered as links to the repository browser.
cmlenz
parents:
112
diff
changeset
|
834 return _formatter |