1
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
2
0
new file mode 100644
0
new file mode 100644
3
index 0000000..6c96a98
4
--- /dev/null
5
+++ b/.bzr-builddeb/default.conf
6
@@ -0,0 +1,2 @@
7
1
[BUILDDEB]
8
2
split = True
9
diff --git a/bileto/models.py b/bileto/models.py
10
index 5ea297f..a3a5bd2 100644
11
--- a/bileto/models.py
12
+++ b/bileto/models.py
13
@@ -3,7 +3,6 @@
14
3
This file defines the two DB schemas, Request and Comment, and various
3
This file defines the two DB schemas, Request and Comment, and various
15
4
metadata related to those.
4
metadata related to those.
16
5
"""
5
"""
17
6
18
7
import re
6
import re
19
8
7
20
9
from os import environ
8
from os import environ
21
@@ -12,6 +11,7 @@ from datetime import datetime
22
12
from functools import lru_cache
11
from functools import lru_cache
23
13
from fcntl import LOCK_EX, LOCK_NB, flock
12
from fcntl import LOCK_EX, LOCK_NB, flock
24
14
13
25
14
from qakit.ust.worker import Worker, UstResult
26
15
from sqlalchemy import BigInteger, desc, text
15
from sqlalchemy import BigInteger, desc, text
27
16
from sqlalchemy.inspection import inspect
16
from sqlalchemy.inspection import inspect
28
17
from sqlalchemy.orm import relationship
17
from sqlalchemy.orm import relationship
29
@@ -53,6 +53,11 @@ BRITNEY_SIGNOFF = """Automated Signoff
30
53
Indicates if britney has approved the ticket based on autopkgtests & other \
53
Indicates if britney has approved the ticket based on autopkgtests & other \
31
54
factors. Check the excuses page for details."""
54
factors. Check the excuses page for details."""
32
55
55
33
56
UST_SIGNOFF = """Ubuntu System Tests Signoff
34
57
35
58
Indicates if ubuntu system tests has approved the silo"""
36
59
37
60
38
56
CREATOR = """Request Creator
61
CREATOR = """Request Creator
39
57
62
40
58
Launchpad nickname of the person who created this request."""
63
Launchpad nickname of the person who created this request."""
41
@@ -103,6 +108,10 @@ QA = """QA Signoff
42
103
108
43
104
Indicates whether or not the ticket has been approved by QA team."""
109
Indicates whether or not the ticket has been approved by QA team."""
44
105
110
45
111
UST = """UST Signoff
46
112
47
113
Indicates whether or not the silo has been approved by Ubuntu system tests."""
48
114
49
106
SERIES = """Target Series
115
SERIES = """Target Series
50
107
116
51
108
What series to build for, eg, wily, vivid, or yakkety+xenial+vivid."""
117
What series to build for, eg, wily, vivid, or yakkety+xenial+vivid."""
52
@@ -239,6 +248,8 @@ class Request(db.Model, BiletoModel):
53
239
    dest = db.Column(db.Text, default=EMPTY, doc=PPA)
248
    dest = db.Column(db.Text, default=EMPTY, doc=PPA)
54
240
    lander_signoff = db.Column(db.Text, default=EMPTY, doc=LANDER_SIGNOFF)
249
    lander_signoff = db.Column(db.Text, default=EMPTY, doc=LANDER_SIGNOFF)
55
241
    britney_signoff = db.Column(db.Text, default=EMPTY, doc=BRITNEY_SIGNOFF)
250
    britney_signoff = db.Column(db.Text, default=EMPTY, doc=BRITNEY_SIGNOFF)
56
251
    ust_signoff = db.Column(db.Text, default=EMPTY, doc=UST_SIGNOFF)
57
252
    ust_build_url = db.Column(db.Text, default=EMPTY, doc=UST_SIGNOFF)
58
242
    qa_signoff = db.Column(db.Text, default=EMPTY, doc=QA)
253
    qa_signoff = db.Column(db.Text, default=EMPTY, doc=QA)
59
243
254
60
244
    search = db.Column(db.Text, default=EMPTY, doc='Searchable Field')
255
    search = db.Column(db.Text, default=EMPTY, doc='Searchable Field')
61
@@ -329,6 +340,8 @@ class Request(db.Model, BiletoModel):
62
329
        if lander_fail or any(clear in status for clear in CLEAR):
340
        if lander_fail or any(clear in status for clear in CLEAR):
63
330
            self.lander_signoff = EMPTY
341
            self.lander_signoff = EMPTY
64
331
            self.britney_signoff = EMPTY
342
            self.britney_signoff = EMPTY
65
343
            self.ust_signoff = EMPTY
66
344
            self.ust_build_url = EMPTY
67
332
            self.qa_signoff = 'Required'
345
            self.qa_signoff = 'Required'
68
333
            self.autopkgtest = EMPTY
346
            self.autopkgtest = EMPTY
69
334
347
70
diff --git a/bileto/static/index.html b/bileto/static/index.html
71
335
new file mode 100644
348
new file mode 100644
72
index 0000000..9422e18
73
--- /dev/null
74
+++ b/bileto/static/index.html
75
@@ -0,0 +1,285 @@
76
1
<!DOCTYPE html>
77
2
<html ng-app="Bileto" ng-controller="appController">
78
3
<head>
79
4
<meta charset="utf-8" />
80
5
<title>Bileto Landing Tickets</title>
81
6
<link rel="stylesheet" type="text/css" href="/static/style.css">
82
7
<link rel="icon" type="image/gif" href="/static/goldenticket.png">
83
8
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0/angular.min.js"></script>
84
9
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0/angular-sanitize.min.js"></script>
85
10
<script src="/static/app.js" charset="utf-8"></script>
86
11
</head>
87
12
<body>
88
13
89
14
<datalist ng-repeat="(list, items) in meta.datalists" id="{{list}}">
90
15
<option ng-repeat="item in items" value="{{item}}" />
91
16
</datalist>
92
17
93
18
<div id="nav">
94
19
<div id="login">
95
20
<a href="/logout" ng-if="data.nickname">Log out {{data.nickname}}</a>
96
21
<form name="sso_login" action="/login" method=post ng-if="!data.nickname">
97
22
<input type=submit value="Log in with Ubuntu SSO">
98
23
<input type=hidden name=next value="/#{{here}}">
99
24
</form>
100
25
</div>
101
26
<a href="#/create" ng-if="data.nickname">Create New Request</a>
102
27
<a href="#" ng-click="editing = null">All Requests</a>
103
28
<a href="#/silo/landing" ng-click="editing = null">{{data.assigned}} Active</a>
104
29
<a href="#/user/{{data.ircnick}}" ng-click="editing = null" ng-if="data.ircnick">Mine</a>
105
30
<a href="#/failures" ng-click="editing = null">Failures</a>
106
31
<a href="#/tickets?active_only&amp;lander_signoff=Approved" ng-click="editing = null">Lander Approved</a>
107
32
<a href="#/tickets?active_only&amp;qa_signoff=Ready" ng-click="editing = null">Ready for QA</a>
108
33
<a href="#/publishable" ng-click="editing = null">Publishable</a>
109
34
<a href="#/tickets?status=queue" ng-click="editing = null">Queued</a>
110
35
<a href="#/tickets?status=pocket" ng-click="editing = null">Migrating</a>
111
36
<a href="#/tickets?status=Landed" ng-click="editing = null">Landed</a>
112
37
<a href="#/tickets?status=Abandoned" ng-click="editing = null">Abandoned</a>
113
38
<form name="live_search">
114
39
<input type="search" class="search" placeholder="Search..." ng-model="searchstring" />
115
40
<input type="submit" ng-click="search(searchstring)" value="Search All Requests" />
116
41
<input type="submit" ng-click="search(searchstring, true)" value="Search Active Requests" />
117
42
<input type="submit" ng-click="siloname(searchstring)" value="Show PPA #" />
118
43
<input type="submit" ng-click="request(searchstring)" value="Show Ticket #" />
119
44
</form>
120
45
</div>
121
46
122
47
<div id="body">
123
48
124
49
<div id="error" ng-if="error">
125
50
<h2>{{error.header}}</h2>
126
51
<img src="/static/error.gif">
127
52
<p>{{error.message}}</p>
128
53
</div>
129
54
130
55
<div ng-if="data.prev" class="center">
131
56
<a ng-click="prev()">... newer ...</a>
132
57
</div>
133
58
134
59
<div id="requests">
135
60
<div class="req" ng-repeat="req in data.requests" ng-class="{card: !expand}">
136
61
137
62
<div class="summary" ng-if="!expand" ng-click="request(req.request_id)">
138
63
<p><span class="{{req.status_color}}" title="{{interpret_color(req.status_color)}}">&nbsp;</span>
139
64
<span class="signoff_{{req.lander_signoff}}" title="Lander {{req.lander_signoff}}">&nbsp;</span>
140
65
<span class="signoff_{{req.britney_signoff}}" title="Britney {{req.britney_signoff}}">&nbsp;</span>
141
66
<span class="signoff_{{req.ust_signoff}}" title="UST {{req.britney_signoff}}">&nbsp;</span>
142
67
<span class="signoff_{{req.qa_signoff}}" title="QA {{req.qa_signoff}}">&nbsp;</span></p>
143
68
<p><a href="#/ticket/{{req.request_id}}">{{req.request_id}}.&nbsp;{{req.date | date:'yyyy-MM-dd'}}&nbsp;{{req.siloname}}</a></p>
144
69
<p>{{req.sources}}</p>
145
70
<p ng-bind-html="linkify(req.description)"></p>
146
71
<p>{{req.landers}}</p>
147
72
</div>
148
73
149
74
<div class="expanded" ng-if="expand">
150
75
<div class="display" ng-if="!editing">
151
76
<form name="live_edit">
152
77
<table class="details">
153
78
154
79
<tr>
155
80
<th class="signoff">
156
81
<a target="_blank" href="{{req.job_log}}" ng-if="req.job_log" class="status_details" title="Click for Details">&#187; {{title(meta.docs.status)}}</a>
157
82
<span ng-if="!req.job_log">{{title(meta.docs.status)}}</span>
158
83
</th>
159
84
<td ng-bind-html="display_status(req.status)" class="{{req.status_color}}"></td>
160
85
</tr>
161
86
162
87
<tr>
163
88
<th class="signoff">{{title(meta.docs.lander_signoff)}}</th>
164
89
<td class="signoff signoff_{{req.lander_signoff}}">
165
90
<select class="signoff signoff_{{req.lander_signoff}}" name="lander_signoff" title="{{meta.docs.lander_signoff}}" ng-change="submit(live_edit, req)" ng-model="req.lander_signoff" ng-options="value for value in meta.datalists.lander_signoff" ng-disabled="!data.teams.length"></select>
166
91
</td>
167
92
</tr>
168
93
169
94
<tr>
170
95
<th class="signoff">{{title(meta.docs.britney_signoff)}}</th>
171
96
<td class="signoff_{{req.britney_signoff}}">{{req.britney_signoff}}</td>
172
97
</tr>
173
98
174
99
<tr>
175
100
<th class="signoff">{{title(meta.docs.ust_signoff)}}</th>
176
101
<td>
177
102
<a href="{{req.ust_build_url}}">
178
103
<div class="signoff_{{req.ust_signoff}}">
179
104
{{req.ust_signoff}}
180
105
</div>
181
106
</a>
182
107
</td>
183
108
</tr>
184
109
185
110
<tr>
186
111
<th class="signoff">{{title(meta.docs.qa_signoff)}}</th>
187
112
<td class="signoff signoff_{{req.qa_signoff}}">
188
113
<select class="signoff signoff_{{req.qa_signoff}}" name="qa_signoff" title="{{meta.docs.qa_signoff}}" ng-change="submit(live_edit, req)" ng-model="req.qa_signoff" ng-options="value for value in meta.datalists.qa_signoff" ng-disabled="!data.admin.length && !req.download_links"></select>
189
114
</td>
190
115
</tr>
191
116
192
117
<tr>
193
118
<th>{{title(meta.docs.artifacts)}}</th>
194
119
<td ng-bind-html="linkify(req.artifacts)"></td>
195
120
</tr>
196
121
197
122
<tr ng-if="req.autopkgtest">
198
123
<th>{{title(meta.docs.autopkgtest)}}</th>
199
124
<td ng-bind-html="linkify(req.autopkgtest)"></td>
200
125
</tr>
201
126
202
127
<tr ng-repeat="field in long_fields">
203
128
<th>{{title(meta.docs[field])}}</th>
204
129
<td ng-bind-html="linkify(req[field])"></td>
205
130
</tr>
206
131
207
132
<tr>
208
133
<th>{{title(meta.docs.siloname)}}</th>
209
134
<td ng-bind-html="display_siloname(meta.ppa_team, req.siloname)"></td>
210
135
</tr>
211
136
212
137
<!-- FIXME: sync_request is bit-rotty and doesn't work. disabled for now.
213
138
<tr>
214
139
<th>{{title(meta.docs.sync_request)}}</th>
215
140
<td>{{req.sync_request}}</td>
216
141
</tr>
217
142
-->
218
143
219
144
<tr>
220
145
<th>{{title(meta.docs.sources)}}</th>
221
146
<td class="sources" ng-bind-html="display_sources(req.sources)"></td>
222
147
</tr>
223
148
224
149
<tr ng-repeat="field in dropdowns">
225
150
<th>{{title(meta.docs[field])}}</th>
226
151
<td>{{req[field]}}</td>
227
152
</tr>
228
153
229
154
<tr ng-if="req.series.indexOf('+') === -1">
230
155
<th>{{title(meta.docs.dest)}}</th>
231
156
<td ng-bind-html="display_dest(req.dest)"></td>
232
157
</tr>
233
158
234
159
<tr>
235
160
<th>{{title(meta.docs.landers)}}</th>
236
161
<td ng-bind-html="display_landers(req.landers)"></td>
237
162
</tr>
238
163
239
164
<tr>
240
165
<th><a href="#/ticket/{{req.request_id}}">{{title(meta.docs.request_id)}}</a></th>
241
166
<td><a href="#/ticket/{{req.request_id}}">
242
167
<span ng-bind-html="easter_egg(req.request_id)"></span>
243
168
{{req.request_id}}.&nbsp;{{req.date | date:'yyyy-MM-dd'}}
244
169
</a></td>
245
170
</tr>
246
171
247
172
</table>
248
173
</form>
249
174
</div>
250
175
</div>
251
176
252
177
<div class="edit" ng-if="editing">
253
178
<form name="edit_request">
254
179
<p>
255
180
<textarea rows="6" name="description"
256
181
          placeholder="{{title(meta.docs.description)}}" title="{{meta.docs.description}}"
257
182
          ng-model="req.description" required>{{req.description}}</textarea>
258
183
</p>
259
184
<p>
260
185
<textarea rows="6" name="test_plan"
261
186
          placeholder="{{title(meta.docs.test_plan)}}" title="{{meta.docs.test_plan}}"
262
187
          ng-model="req.test_plan" required>{{req.test_plan}}</textarea>
263
188
</p>
264
189
<p>
265
190
<textarea rows="6" wrap="off" name="merge_proposals"
266
191
          placeholder="{{title(meta.docs.merge_proposals)}}" title="{{meta.docs.merge_proposals}}"
267
192
          ng-model="req.merge_proposals" ng-pattern="/^((https?:\/\/code.launchpad.net\/~\S+\/\+merge\/\d+|#.*)[\s\n]*)*$/">{{req.merge_proposals}}</textarea>
268
193
</p>
269
194
<p>
270
195
<textarea rows="6" wrap="off" name="download_links"
271
196
          placeholder="{{title(meta.docs.download_links)}}" title="{{meta.docs.download_links}}"
272
197
          ng-model="req.download_links" ng-pattern="/^(https?:\/\/\S+[\s\n]*)*$/">{{req.download_links}}</textarea>
273
198
</p>
274
199
<p>
275
200
<input type="text" name="landers" list="landers" size="10"
276
201
       placeholder="{{title(meta.docs.landers)}}" title="{{meta.docs.landers}}"
277
202
       value="{{req.landers}}" ng-model="req.landers" />
278
203
</p>
279
204
<!-- FIXME: sync_request is bit-rotty and doesn't work. disabled for now.
280
205
<p>
281
206
<input type="text" name="sync_request" list="sync_request" size="10"
282
207
       placeholder="{{title(meta.docs.sync_request)}}" title="{{meta.docs.sync_request}}"
283
208
       value="{{req.sync_request}}" ng-model="req.sync_request"
284
209
       ng-pattern="/^(\d+|\S+,[a-z0-9.]+)$/"/>
285
210
</p>
286
211
-->
287
212
<p>
288
213
<input type="text" name="sources" list="sources" size="10"
289
214
       placeholder="{{title(meta.docs.sources)}}" title="{{meta.docs.sources}}"
290
215
       value="{{req.sources}}" ng-model="req.sources" />
291
216
</p>
292
217
<p ng-repeat="field in dropdowns">
293
218
<select name="{{field}}" title="{{meta.docs[field]}}" ng-model="req[field]" ng-options="value for value in meta.datalists[field]"></select>
294
219
</p>
295
220
<p ng-if="req.series.indexOf('+') === -1">
296
221
<select name="dest" title="{{meta.docs.dest}}" ng-model="req.dest">
297
222
<option value="">Ubuntu Archive</option>
298
223
<option value="ci-train-ppa-service/ubuntu/stable-phone-overlay">Stable Overlay PPA</option>
299
224
</select>
300
225
</p>
301
226
<p>
302
227
<input type="hidden" name="distribution" value="ubuntu" ng-model="req.distribution" />
303
228
<button ng-click="submit(edit_request, req)" ng-disabled="busy || !edit_request.$valid">
304
229
<span ng-if="req.request_id">Save #{{req.request_id}}</span>
305
230
<span ng-if="!req.request_id">Create New Request</span>
306
231
<span ng-if="!edit_request.$valid">(mouse over pink fields for help)</span>
307
232
</button>
308
233
<div class="red" ng-if="display_sru_warning(req)">Warning: Are you sure you want to
309
234
publish an SRU?</div>
310
235
</p>
311
236
</form>
312
237
</div>
313
238
314
239
<div class="actionbox" ng-if="req.request_id && expand">
315
240
<table class="actions"><tr>
316
241
<td ng-if="!editing"><a href="/log/{{req.request_id}}/build" target="_blank">Build</a></td>
317
242
<td ng-if="req.siloname && !editing"><a href="/log/{{req.request_id}}/diff" target="_blank">Diff</a></td>
318
243
<td ng-if="!editing"><a href="/log/{{req.request_id}}/revert" target="_blank">Revert</a></td>
319
244
<td ng-if="req.siloname && !editing"><a href="/log/{{req.request_id}}/publish" target="_blank">Publish</a></td>
320
245
<td ng-if="!editing"><a href="/log/{{req.request_id}}/finalize" target="_blank">Finalize</a></td>
321
246
<td ng-if="!editing"><a href="/log/{{req.request_id}}/abandon" target="_blank">Abandon</a></td>
322
247
<td ng-if="editing"><a ng-click="cancel()">Cancel Edit</a></td>
323
248
<td ng-if="data.nickname && !editing"><a ng-click="edit(req)">Edit</a></td>
324
249
</tr></table>
325
250
</div>
326
251
327
252
<div class="comments" ng-if="expand">
328
253
<a ng-click="toggle_log()" ng-if="expand && data.requests[0].comments.length"><span ng-if="!full_log">&#9656;&nbsp;Show</span><span ng-if="full_log">&#9662;&nbsp;Hide</span> Audit Logs</a>
329
254
<div class="comment" ng-repeat="comment in req.comments" ng-if="full_log || !comment.log_url">
330
255
<strong>
331
256
<a target="_blank" href="{{comment.log_url}}" ng-if="comment.log_url">{{comment.date | date:'yyyy-MM-dd HH:mm:ss Z'}} ({{comment.author}})</a>
332
257
<span ng-if="!comment.log_url">{{comment.date | date:'yyyy-MM-dd HH:mm:ss Z'}} ({{comment.author}})</span>
333
258
</strong>
334
259
<span ng-bind-html="display_status(comment.text)"></span>
335
260
</div>
336
261
</div>
337
262
338
263
<div class="new_comment" ng-if="req.request_id && data.nickname && expand && !editing">
339
264
<form name="new_comment_form">
340
265
<textarea class="commentbox" rows="2" name="comment_text" placeholder="Add a comment..." ng-model="new_comment.text"></textarea>
341
266
<button ng-click="post_comment(req.request_id, new_comment.text)" ng-disabled="busy">Save Comment</button>
342
267
</form>
343
268
</div>
344
269
345
270
</div>
346
271
347
272
<div ng-if="data.next" class="center">
348
273
<a ng-click="next()">... older ...</a>
349
274
</div>
350
275
351
276
<div id="admin">
352
277
<a href="/static/logs.html">All Logs</a>
353
278
<a href="/static/britney/index.html">Britney Files</a>
354
279
<a href="/static/report.txt">Diagnostic Report</a>
355
280
</div>
356
281
357
282
<div id="busy" ng-if="busy"></div>
358
283
359
284
</body>
360
285
</html>
361
diff --git a/bileto/static/style.css b/bileto/static/style.css
362
0
new file mode 100644
286
new file mode 100644
363
index 0000000..985e85f
364
--- /dev/null
365
+++ b/bileto/static/style.css
366
@@ -0,0 +1,384 @@
367
1
html, body {
368
2
    background-color: white;
369
3
    color: black;
370
4
    font-family: Ubuntu, Arial, sans-serif;
371
5
    margin: 0;
372
6
    padding: 0;
373
7
}
374
8
375
9
body {
376
10
    padding-bottom: 1em;
377
11
}
378
12
379
13
input, select, button, textarea {
380
14
    width: 100%;
381
15
    font-size: medium;
382
16
}
383
17
384
18
a {
385
19
    color: #dd4814;
386
20
    background-color: white;
387
21
}
388
22
389
23
a, input[type=submit], select, button, .summary {
390
24
    cursor: pointer;
391
25
    text-decoration: none;
392
26
    outline: 0;
393
27
    margin: 0;
394
28
    border: 0;
395
29
    border-radius: 0;
396
30
    font-size: medium;
397
31
}
398
32
399
33
#nav {
400
34
    text-align: center;
401
35
    width: auto;
402
36
    float: right;
403
37
}
404
38
405
39
#body {
406
40
    width: auto;
407
41
    overflow: hidden;
408
42
}
409
43
410
44
form {
411
45
    display: block;
412
46
    margin: 0;
413
47
    padding: 0;
414
48
    width: 100%;
415
49
}
416
50
417
51
h1, #nav a, #nav input, .new_comment button, .actions a {
418
52
    background-color: #dd4814;
419
53
    border: 0;
420
54
    color: white;
421
55
    display: block;
422
56
    margin: 0;
423
57
    padding: 1em;
424
58
    text-decoration: none;
425
59
    text-align: center;
426
60
}
427
61
428
62
.status_details {
429
63
    background-color: #dd4814;
430
64
    color: white;
431
65
    padding: 0.3em;
432
66
}
433
67
434
68
h1 {
435
69
    font-size: large;
436
70
    text-align: center;
437
71
    width: auto;
438
72
}
439
73
440
74
th {
441
75
    text-align: right;
442
76
    vertical-align: top;
443
77
    white-space: nowrap;
444
78
    padding-right: 0.5em;
445
79
}
446
80
447
81
td {
448
82
    vertical-align: top;
449
83
    text-align: left;
450
84
}
451
85
452
86
#nav input, .new_comment input {
453
87
    width: 100%;
454
88
}
455
89
456
90
#nav input[type=search] {
457
91
    border-top: 1px solid white;
458
92
}
459
93
460
94
#nav a:hover, #nav input:hover, h1:hover,
461
95
.edit input[type=submit]:hover, .edit button:hover,
462
96
.new_comment input:hover, .new_comment button:hover,
463
97
.actions a:hover {
464
98
    text-decoration: none;
465
99
    background-color: white;
466
100
    color: #dd4814;
467
101
}
468
102
469
103
#requests, .display, .edit {
470
104
    display: block;
471
105
}
472
106
473
107
#requests {
474
108
    padding-top: 2em;
475
109
}
476
110
477
111
#requests > * {
478
112
    vertical-align: top;
479
113
}
480
114
481
115
.req {
482
116
    text-align: center;
483
117
}
484
118
485
119
.edit {
486
120
    margin-top: -2em;
487
121
}
488
122
489
123
.summary {
490
124
    padding: 0.5em 1em 1em 1em;
491
125
    max-height: 20em;
492
126
}
493
127
494
128
.summary p {
495
129
    margin: 0.5em;
496
130
}
497
131
498
132
.display {
499
133
    padding: 1em;
500
134
}
501
135
502
136
.card {
503
137
    width: 450px;
504
138
    display: inline-block;
505
139
    text-align: left;
506
140
    border-top: 1px solid #ccc;
507
141
    margin: 1em;
508
142
    overflow: auto;
509
143
}
510
144
511
145
.card, .display {
512
146
    margin-top: 0;
513
147
    padding-top: 0;
514
148
}
515
149
516
150
.details {
517
151
    width: auto;
518
152
    margin: 0 auto;
519
153
}
520
154
521
155
.details td, .details th {
522
156
    padding: 0.2em;
523
157
}
524
158
525
159
td.sources a {
526
160
    display: block;
527
161
}
528
162
529
163
.center {
530
164
    text-align: center;
531
165
}
532
166
533
167
input, textarea, button, select {
534
168
    width: 100%;
535
169
    display: block;
536
170
    color: black;
537
171
    background-color: #eee;
538
172
    padding: 0.5em;
539
173
    border: 0;
540
174
    box-sizing: border-box;
541
175
    -webkid-box-sizing: border-box;
542
176
    -moz-box-sizing: border-box;
543
177
}
544
178
545
179
.edit input[type=submit], .edit button {
546
180
    background-color: #dd4814;
547
181
    color: white;
548
182
    padding: 1em;
549
183
    border: 0;
550
184
}
551
185
552
186
p {
553
187
    margin: 1em 1em 0 1em;
554
188
}
555
189
556
190
.comments {
557
191
    display: inline-block;
558
192
    width: auto;
559
193
    padding: 0 2em;
560
194
    margin: 0 auto;
561
195
    text-align: left;
562
196
}
563
197
564
198
.new_comment {
565
199
    padding: 0;
566
200
    margin: 1em;
567
201
}
568
202
569
203
table, tr, td {
570
204
    border-collapse: collapse;
571
205
    margin: 0;
572
206
    padding: 0;
573
207
}
574
208
575
209
table {
576
210
    width: 100%;
577
211
}
578
212
579
213
.commentbox {
580
214
    width: 100%;
581
215
}
582
216
583
217
.actionbox {
584
218
    margin: 1em;
585
219
}
586
220
587
221
table.actions {
588
222
    table-layout: fixed;
589
223
}
590
224
591
225
table.actions tr, table.actions td {
592
226
    height: 100%;
593
227
    vertical-align: middle;
594
228
}
595
229
596
230
table.actions a {
597
231
    display: block;
598
232
    width: 100%;
599
233
    height: 100%;
600
234
    padding: 1em 0;
601
235
    vertical-align: middle;
602
236
    box-sizing: border-box;
603
237
    -webkid-box-sizing: border-box;
604
238
    -moz-box-sizing: border-box;
605
239
}
606
240
607
241
select.signoff {
608
242
    width: auto;
609
243
    display: inline-block;
610
244
}
611
245
612
246
/* These colors must be kept in sync with $scope.interpret_colors in app.js */
613
247
.black::before, .signoff_::before, .signoff_Required::before,
614
248
.red::before, .signoff_Failed::before,
615
249
.orange::before, .signoff_Queued::before, .signoff_Running::before, .signoff_Ready::before,
616
250
.purple::before,
617
251
.green::before, .signoff_N\/A::before, .signoff_Approved::before,
618
252
.olive::before,
619
253
.blue::before,
620
254
.grey::before {
621
255
    font-size: xx-large;
622
256
    line-height: 0;
623
257
    display: inline-block;
624
258
    text-align: center;
625
259
    width: 1em;
626
260
}
627
261
628
262
.black, .signoff_, .signoff_Required {
629
263
    color: black;
630
264
}
631
265
632
266
.black::before, .signoff_::before, .signoff_Required::before {
633
267
    color: black;
634
268
    content: "— ";
635
269
}
636
270
637
271
.red, .signoff_Failed {
638
272
    color: red;
639
273
    font-weight: bold;
640
274
}
641
275
642
276
.red::before, .signoff_Failed::before {
643
277
    color: red;
644
278
    content: "✘ ";
645
279
}
646
280
647
281
.orange, .signoff_Queued, .signoff_Running, .signoff_Ready {
648
282
    color: orange;
649
283
    font-weight: bold;
650
284
}
651
285
652
286
.orange::before, .signoff_Queued::before, .signoff_Running::before, .signoff_Ready::before {
653
287
    color: orange;
654
288
    content: "⚡ ";
655
289
}
656
290
657
291
.purple {
658
292
    color: purple;
659
293
}
660
294
661
295
.purple::before {
662
296
    color: purple;
663
297
    content: "♨ ";
664
298
}
665
299
666
300
.green, .signoff_N\/A, .signoff_Approved {
667
301
    color: green;
668
302
}
669
303
670
304
.green::before, .signoff_N\/A::before, .signoff_Approved::before {
671
305
    color: green;
672
306
    content: "✔ ";
673
307
}
674
308
675
309
.olive {
676
310
    color: olive;
677
311
    font-weight: bold;
678
312
}
679
313
680
314
.olive::before {
681
315
    color: olive;
682
316
    content: "✱ ";
683
317
}
684
318
685
319
.blue {
686
320
    color: blue;
687
321
}
688
322
689
323
.blue::before {
690
324
    color: blue;
691
325
    content: "✔ ";
692
326
}
693
327
694
328
.grey {
695
329
    color: grey;
696
330
}
697
331
698
332
.grey::before {
699
333
    color: #888;
700
334
    content: "◌ ";
701
335
}
702
336
703
337
#busy {
704
338
    background-color: black;
705
339
    color: black;
706
340
    height: 100%;
707
341
    left: 0;
708
342
    margin: 0;
709
343
    opacity: 0.3;
710
344
    padding: 0;
711
345
    position: absolute;
712
346
    top: 0;
713
347
    width: 100%;
714
348
}
715
349
716
350
.fifty {
717
351
    width: 50%;
718
352
    display: inline-block;
719
353
}
720
354
721
355
#error {
722
356
    width: 100%;
723
357
    text-align: center;
724
358
}
725
359
726
360
textarea.ng-invalid, input.ng-invalid {
727
361
    background-color: #ffe5e5;
728
362
}
729
363
730
364
button[disabled], button[disabled]:hover, button[disabled]:focus, button[disabled]:active,
731
365
select[disabled], select[disabled]:hover, select[disabled]:focus, select[disabled]:active {
732
366
    color: #666;
733
367
    background-color: #ccc;
734
368
    cursor: default;
735
369
}
736
370
737
371
.signoff {
738
372
    vertical-align: middle;
739
373
}
740
374
741
375
#admin {
742
376
    margin: 3em 0 0 0;
743
377
    text-align: center;
744
378
    font-size: x-small;
745
379
}
746
380
747
381
#admin a {
748
382
    margin: 1em;
749
383
    font-size: x-small;
750
384
}
751
diff --git a/britney/iterate.py b/britney/iterate.py
752
index edd9b35..08d3bae 100755
753
--- a/britney/iterate.py
754
+++ b/britney/iterate.py
755
@@ -20,6 +20,7 @@ from fcntl import LOCK_EX, LOCK_NB, flock
756
20
from os import unlink, symlink
20
from os import unlink, symlink
757
21
from os.path import abspath, dirname, exists
21
from os.path import abspath, dirname, exists
758
22
22
759
23
from qakit.ust.worker import UstResult, Worker
760
23
from requests import get, post
24
from requests import get, post
761
24
25
762
25
HOME = dirname(abspath(__file__))
26
HOME = dirname(abspath(__file__))
763
@@ -179,6 +180,34 @@ def parallelize_fetching(all_series, runs):
764
179
        update_request(ticket)
180
        update_request(ticket)
765
180
181
766
181
182
767
183
def compute_ust_signoff(requests):
768
184
    """Notify the ticket status in ubuntu system tests.
769
185
    Once a silo is assigned to the ticket, ust is triggered only if
770
186
    the lander has approved the ticket. After triggering the tests,
771
187
    the worker is asked for results
772
188
    :return UstResult which has two attributes: status and build url
773
189
    which are both use in the UI"""
774
190
    ust_signoff = None
775
191
    for request in requests:
776
192
        if not request['siloname']:
777
193
            ust_worker = Worker()
778
194
            if request['ust_signoff'] == "":
779
195
                if request['lander_signoff'] == 'Approved':
780
196
                    try:
781
197
                        ust_worker.run_ust(request['siloname'])
782
198
                        ust_signoff = UstResult("Queued", "")
783
199
                    except Exception:
784
200
                        pass
785
201
786
202
        if ust_signoff:
787
203
            req = dict(
788
204
                author='ust-bot',
789
205
                request_id=request['request_id'],
790
206
                ust_signoff=ust_signoff.status)
791
207
            post(WRITE_API + Config.api_token, dumps(req, sort_keys=True),
792
208
                headers={'content-type': 'application/json'})
793
209
794
210
795
182
def print_proc(proc):
211
def print_proc(proc):
796
183
    """Print the output from a subprocess."""
212
    """Print the output from a subprocess."""
797
184
    sys.stdout.buffer.write(BNEWLINE.join(
213
    sys.stdout.buffer.write(BNEWLINE.join(
798
@@ -194,6 +223,7 @@ def main():
799
194
        sys.stderr = sys.stdout = open(LOG_NAME, 'x')
223
        sys.stderr = sys.stdout = open(LOG_NAME, 'x')
800
195
        reqs = get_requests()
224
        reqs = get_requests()
801
196
        parallelize_fetching(*build_siloname_dict(reqs))
225
        parallelize_fetching(*build_siloname_dict(reqs))
802
226
        compute_ust_signoff(reqs)
803
197
    except BlockingIOError:
227
    except BlockingIOError:
804
198
        return 0
228
        return 0
805
199
    except (IOError, ConnectionRefusedError):
229
    except (IOError, ConnectionRefusedError):
806
@@ -205,6 +235,5 @@ def main():
807
205
        cleanup(lock)
235
        cleanup(lock)
808
206
    return 0
236
    return 0
809
207
237
810
208
811
209
if __name__ == '__main__':                          # pragma: no cover
238
if __name__ == '__main__':                          # pragma: no cover
812
210
    sys.exit(main())
239
    sys.exit(main())
813
diff --git a/db_migrations.sh b/db_migrations.sh
814
index e346c14..f6a8b3f 100755
815
--- a/db_migrations.sh
816
+++ b/db_migrations.sh
817
@@ -32,6 +32,7 @@ exit 0
818
32
# These ones have succeeded in production and only kept for reference
32
# These ones have succeeded in production and only kept for reference
819
33
$PG "ALTER TABLE request ADD COLUMN lander_signoff text DEFAULT '';" || true
33
$PG "ALTER TABLE request ADD COLUMN lander_signoff text DEFAULT '';" || true
820
34
$PG "ALTER TABLE request ADD COLUMN britney_signoff text DEFAULT '';" || true
34
$PG "ALTER TABLE request ADD COLUMN britney_signoff text DEFAULT '';" || true
821
35
$PG "ALTER TABLE request ADD COLUMN ust_signoff text DEFAULT '';" || true
822
35
$PG "ALTER TABLE request ADD COLUMN status_color text DEFAULT '';" || true
36
$PG "ALTER TABLE request ADD COLUMN status_color text DEFAULT '';" || true
823
36
$PG "ALTER TABLE request ADD COLUMN artifacts text DEFAULT '';" || true
37
$PG "ALTER TABLE request ADD COLUMN artifacts text DEFAULT '';" || true
824
37
38
825
diff --git a/scripts/import.sh b/scripts/import.sh
826
38
new file mode 100755
39
new file mode 100755
827
index 0000000..60b8173
828
--- /dev/null
829
+++ b/scripts/import.sh
830
@@ -0,0 +1,26 @@
831
1
#!/bin/sh
832
2
833
3
# This is a history-destroying git-to-bzr converter,
834
4
# for when you just want the code.
835
5
836
6
repos="https://github.com/emacs-mirror/emacs.git"
837
7
838
8
sleep "$(shuf --input-range 0-60 --head-count 1)"
839
9
840
10
set -eux
841
11
842
12
843
13
for repo in $repos; do
844
14
    base="$(basename "$repo" .git)"
845
15
    tmpdir="/tmp/$base"
846
16
847
17
    [ -d "$tmpdir" ] || git clone --depth 1 "$repo" "$tmpdir"
848
18
    cd "$tmpdir"
849
19
    git pull
850
20
851
21
    [ -d ".bzr" ] || bzr init .
852
22
    echo '.git*' > .bzrignore
853
23
    bzr add .
854
24
    bzr commit --message "Auto commit $(date)"
855
25
    bzr push "lp:~/$base/imported" --overwrite
856
26
done
Status:	Rejected
Rejected by:	Robert Bruce Park on 2016-12-08
Proposed branch:	~sbaldassin/bileto:ust-bileto
Merge into:	bileto:master
Diff against target:	856 lines (+742/-2) 7 files modified .bzr-builddeb/default.conf (+2/-0) bileto/models.py (+14/-1) bileto/static/index.html (+285/-0) bileto/static/style.css (+384/-0) britney/iterate.py (+30/-1) db_migrations.sh (+1/-0) scripts/import.sh (+26/-0)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Robert Bruce Park (community)		2016-09-20	Needs Information on 2016-09-20
Review via email: mp+306251@code.launchpad.net