Linaro Android Frontend

Merge lp:~milo/linaro-android-frontend/bug1154685 into lp:linaro-android-frontend

  1. bug1154685
  2. Merge into trunk
Proposed by Milo Casagrande
Status: Merged
Merged at revision: 310
Proposed branch: lp:~milo/linaro-android-frontend/bug1154685
Merge into: lp:linaro-android-frontend
Diff against target: 347 lines (+136/-39)
3 files modified
android_build/templates/index.html (+53/-3)
group-fixture.json (+16/-0)
static/index.js (+67/-36)
To merge this branch: bzr merge lp:~milo/linaro-android-frontend/bug1154685
Reviewer Review Type Date Requested Status
Georgy Redkozubov Approve
Stevan Radaković Pending
Linaro Automation & Validation Pending
Review via email: mp+154736@code.launchpad.net

Description of the change

Added a new tab in the Member builds one, for Hisilicon member.

Staging istance is being prepared to test it.

To post a comment you must log in.
Revision history for this message
Milo Casagrande (milo) wrote :

Sandbox with the changes applied is here:

https://ec2-184-72-201-207.compute-1.amazonaws.com

Revision history for this message
Georgy Redkozubov (gesha) wrote :

Looks good.
One question about group-fixture.json changes. Won't we hit problems with reshuffled keys in current database?
If not then ship it.

review: Approve
Revision history for this message
Milo Casagrande (milo) wrote :

On Fri, Mar 22, 2013 at 11:25 AM, Georgy Redkozubov
<email address hidden> wrote:
>
> Review: Approve
>
> Looks good.
> One question about group-fixture.json changes. Won't we hit problems with reshuffled keys in current database?

Hmmm... didn't thought about that, and actually am not sure even.
To err on the side of caution, I'll add the new keys at the end and
re-number the others.

--
Milo Casagrande | Infrastructure Team
Linaro.org <www.linaro.org> │ Open source software for ARM SoCs

lp:~milo/linaro-android-frontend/bug1154685 updated
316. By Milo Casagrande

Renumbered and reworked json fixtures.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'android_build/templates/index.html'
2--- android_build/templates/index.html 2013-03-19 09:17:49 +0000
3+++ android_build/templates/index.html 2013-03-22 14:01:32 +0000
4@@ -302,6 +302,9 @@
5 <li><a id="msamsung" href="#msamsung"><em>Samsung</em></a></li>
6 <li><a id="marm" href="#marm"><em>ARM</em></a></li>
7 <li><a id="mste" href="#mste"><em>ST-E</em></a></li>
8+ <li>
9+ <a id="mhisilicon" href="#mhisilicon"><em>Hisilicon</em></a>
10+ </li>
11 </ul>
12 <div>
13 <div id="mti">
14@@ -356,7 +359,7 @@
15 <ul>
16 <li><a href="#msamsungdaily-tab"><em>Daily</em></a></li>
17 <li><a href="#msamsungrelease-tab"><em>Release</em></a></li>
18- <li><a href="#msamsungestricted-tab"><em>Restricted</em></a></li>
19+ <li><a href="#msamsungrestricted-tab"><em>Restricted</em></a></li>
20 </ul>
21 <div>
22 <div id=msamsungdaily-tab>
23@@ -398,7 +401,7 @@
24 </div>
25 </div>
26 </div>
27- <div id="arm">
28+ <div id="marm">
29 <div id="marmtabs">
30 <ul>
31 <li><a href="#marmdaily-tab"><em>Daily</em></a></li>
32@@ -445,7 +448,7 @@
33 </div>
34 </div>
35 </div>
36- <div id="ste">
37+ <div id="mste">
38 <div id="mstetabs">
39 <ul>
40 <li><a href="#mstedaily-tab"><em>Daily</em></a></li>
41@@ -492,6 +495,53 @@
42 </div>
43 </div>
44 </div>
45+ <div id="mhisilicon">
46+ <div id="mhisilicontabs">
47+ <ul>
48+ <li><a href="#mhisilicondaily-tab"><em>Daily</em></a></li>
49+ <li><a href="#mhisiliconrelease-tab"><em>Release</em></a></li>
50+ <li><a href="#mhisiliconrestricted-tab"><em>Restricted</em></a></li>
51+ </ul>
52+ <div>
53+ <div id=mhisilicondaily-tab>
54+ Search: <input class="search" />
55+ Status: <select>
56+ <option value="Any" selected="selected">Any</option>
57+ <option value="OK">Success</option>
58+ <option value="FAILED">Failure</option>
59+ <option value="ABORTED">Aborted</option>
60+ <option value="RUNNING">Building</option>
61+ <option value="">Never built</option>
62+ </select>
63+ <div class="build-table" id="member-hisilicon-build-table"></div>
64+ </div>
65+ <div id=mhisiliconrelease-tab>
66+ Search: <input class="search" />
67+ Status: <select>
68+ <option value="Any" selected="selected">Any</option>
69+ <option value="OK">Success</option>
70+ <option value="FAILED">Failure</option>
71+ <option value="ABORTED">Aborted</option>
72+ <option value="RUNNING">Building</option>
73+ <option value="">Never built</option>
74+ </select>
75+ <div class="build-table" id="member-hisilicon-release-build-table"></div>
76+ </div>
77+ <div id=mhisiliconrestricted-tab>
78+ Search: <input class="search" />
79+ Status: <select>
80+ <option value="Any" selected="selected">Any</option>
81+ <option value="OK">Success</option>
82+ <option value="FAILED">Failure</option>
83+ <option value="ABORTED">Aborted</option>
84+ <option value="RUNNING">Building</option>
85+ <option value="">Never built</option>
86+ </select>
87+ <div class="build-table" id="member-hisilicon-restricted-build-table"></div>
88+ </div>
89+ </div>
90+ </div>
91+ </div>
92 </div>
93 </div>
94 </div>
95
96=== modified file 'group-fixture.json'
97--- group-fixture.json 2013-01-22 05:19:30 +0000
98+++ group-fixture.json 2013-03-22 14:01:32 +0000
99@@ -110,5 +110,21 @@
100 },
101 "pk" : 14,
102 "model" : "auth.group"
103+ },
104+ {
105+ "fields" : {
106+ "permissions" : [],
107+ "name" : "linaro-android-member-hisilicon"
108+ },
109+ "pk" : 15,
110+ "model" : "auth.group"
111+ },
112+ {
113+ "fields" : {
114+ "permissions" : [],
115+ "name" : "linaro-android-member-hisilicon-restricted"
116+ },
117+ "pk" : 16,
118+ "model" : "auth.group"
119 }
120 ]
121
122=== modified file 'static/index.js'
123--- static/index.js 2013-01-23 16:00:30 +0000
124+++ static/index.js 2013-03-22 14:01:32 +0000
125@@ -12,6 +12,8 @@
126 msamsung_tabview.render();
127 marm_tabview = new Y.TabView({ srcNode: '#marmtabs' });
128 marm_tabview.render();
129+ mhisilicon_tabview = new Y.TabView({ srcNode: '#mhisilicontabs' });
130+ mhisilicon_tabview.render();
131 msubteam_tabview = new Y.TabView({ srcNode: '#msubteams' });
132 msubteam_tabview.render();
133 asubteam_tabview = new Y.TabView({ srcNode: '#asubteams' });
134@@ -153,6 +155,18 @@
135 }
136 });
137
138+ mhisilicon_tabview.on(
139+ 'render',
140+ function (e) {
141+ if (!globalConfig.userName || !in_array(groupsArray, 'linaro-android-member-hisilicon-restricted')) {
142+ var restrictedBuildsTab = mhisilicon_tabview.item(2);
143+ restrictedBuildsTab.on('click', function (e) { e.preventDefault(); });
144+ var restrictedlink = restrictedBuildsTab.get('boundingBox').one('a');
145+ restrictedlink.setStyle('color', 'grey');
146+ restrictedlink.setAttribute('href', globalConfig.loginURL + '?next=' + location.pathname + '%23teams=mhisiliconrestricted');
147+ }
148+ });
149+
150 team_tabview.on(
151 'render',
152 function (e) {
153@@ -165,7 +179,7 @@
154 }
155 });
156
157- if ((history.get('teams') == 'user' && !globalConfig.userName) ||
158+ if ((history.get('teams') == 'user' && !globalConfig.userName) ||
159 (history.get('teams') == 'member' && !globalConfig.userName)) {
160 logInAndGoToMyBuilds();
161 } else {
162@@ -257,9 +271,9 @@
163 });
164
165 function formatCell (o) {
166- // REVISIT: The current format is builds/teamname/jobname
167+ // REVISIT: The current format is builds/teamname/jobname
168 // ex: ~linaro-android-restricted/vexpress-rtsm-isw-jb-test
169- // This must change to builds/teamname/buildtype/jobname
170+ // This must change to builds/teamname/buildtype/jobname
171 //ex: ~linaro-android-official-builders/~linaro-android-restricted/vexpress-rtsm-isw-jb-test
172 return '<a href="builds/' + o.data.name + '/">' + o.value + '</a>';
173 }
174@@ -327,9 +341,9 @@
175 var tables = [
176 makeDT(
177 "#engineering-daily-build-table",
178- function (item) {
179+ function (item) {
180 var group = 'linaro-android';
181- var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
182+ var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
183 return item.getValue('name').search(pattern) == 0 && item.getValue('name').search(/toolchain/) == -1 &&
184 item.getValue('name').search(/galaxynexus-linaro-gcctrunk/) == -1 &&
185 item.getValue('name').search(/panda-jb-gcctrunk-tilt-tracking-blob/) == -1;
186@@ -337,83 +351,100 @@
187 }),
188 makeDT(
189 "#engineering-release-build-table",
190- function (item) {
191+ function (item) {
192 var group = 'linaro-android';
193 var pattern = new RegExp("^~" + group + "\/.*?(?:release).*$");
194 return item.getValue('name').search(pattern) == 0 && item.getValue('name').search(/toolchain/) == -1;
195 }),
196 makeDT(
197 "#engineering-restricted-build-table",
198- function (item) {
199- return item.getValue('name').search(/^~linaro-android-restricted\//) == 0 && item.getValue('name').search(/toolchain/) == -1;
200+ function (item) {
201+ return item.getValue('name').search(/^~linaro-android-restricted\//) == 0 && item.getValue('name').search(/toolchain/) == -1;
202 }),
203 makeDT(
204 "#member-ti-build-table",
205- function (item) {
206+ function (item) {
207 var group = 'linaro-android-member-ti';
208- var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
209+ var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
210 return item.getValue('name').search(pattern) == 0;
211 }),
212 makeDT(
213 "#member-ti-release-build-table",
214- function (item) {
215- return item.getValue('name').search(/^~linaro-android-member-ti\/.*?(?:release).*$/) == 0;
216+ function (item) {
217+ return item.getValue('name').search(/^~linaro-android-member-ti\/.*?(?:release).*$/) == 0;
218 }),
219 makeDT(
220 "#member-ti-restricted-build-table",
221- function (item) {
222+ function (item) {
223 return item.getValue('name').search(/^~linaro-android-member-ti-restricted\//) == 0;
224 }),
225 makeDT(
226 "#member-samsung-build-table",
227- function (item) {
228+ function (item) {
229 var group = 'linaro-android-member-samsung';
230- var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
231+ var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
232 return item.getValue('name').search(pattern) == 0;
233 }),
234 makeDT(
235 "#member-samsung-release-build-table",
236- function (item) {
237- return item.getValue('name').search(/^~linaro-android-member-samsung\/.*?(?:release).*$/) == 0;
238+ function (item) {
239+ return item.getValue('name').search(/^~linaro-android-member-samsung\/.*?(?:release).*$/) == 0;
240 }),
241 makeDT(
242 "#member-samsung-restricted-build-table",
243- function (item) {
244- return item.getValue('name').search(/^~linaro-android-member-samsung-restricted\//) == 0;
245+ function (item) {
246+ return item.getValue('name').search(/^~linaro-android-member-samsung-restricted\//) == 0;
247 }),
248 makeDT(
249 "#member-arm-build-table",
250- function (item) {
251+ function (item) {
252 var group = 'linaro-android-member-arm';
253- var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
254+ var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
255 return item.getValue('name').search(pattern) == 0;
256 }),
257 makeDT(
258 "#member-arm-release-build-table",
259- function (item) {
260- return item.getValue('name').search(/^~linaro-android-member-arm\/.*?(?:release).*$/) == 0;
261+ function (item) {
262+ return item.getValue('name').search(/^~linaro-android-member-arm\/.*?(?:release).*$/) == 0;
263 }),
264 makeDT(
265 "#member-arm-restricted-build-table",
266 function (item) {
267- return item.getValue('name').search(/^~linaro-android-member-arm-restricted\//) == 0;
268+ return item.getValue('name').search(/^~linaro-android-member-arm-restricted\//) == 0;
269 }),
270 makeDT(
271 "#member-ste-build-table",
272- function (item) {
273+ function (item) {
274 var group = 'linaro-android-member-ste';
275- var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
276+ var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
277 return item.getValue('name').search(pattern) == 0;
278 }),
279 makeDT(
280 "#member-ste-release-build-table",
281- function (item) {
282- return item.getValue('name').search(/^~linaro-android-member-ste\/.*?(?:release).*$/) == 0;
283+ function (item) {
284+ return item.getValue('name').search(/^~linaro-android-member-ste\/.*?(?:release).*$/) == 0;
285 }),
286 makeDT(
287 "#member-ste-restricted-build-table",
288- function (item) {
289- return item.getValue('name').search(/^~linaro-android-member-ste-restricted\//) == 0;
290+ function (item) {
291+ return item.getValue('name').search(/^~linaro-android-member-ste-restricted\//) == 0;
292+ }),
293+ makeDT(
294+ "#member-hisilicon-build-table",
295+ function (item) {
296+ var group = 'linaro-android-member-hisilicon';
297+ var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
298+ return item.getValue('name').search(pattern) == 0;
299+ }),
300+ makeDT(
301+ "#member-hisilicon-release-build-table",
302+ function (item) {
303+ return item.getValue('name').search(/^~linaro-android-member-hisilicon\/.*?(?:release).*$/) == 0;
304+ }),
305+ makeDT(
306+ "#member-hisilicon-restricted-build-table",
307+ function (item) {
308+ return item.getValue('name').search(/^~linaro-android-member-hisilicon-restricted\//) == 0;
309 }),
310 makeDT(
311 "#user-build-table",
312@@ -425,21 +456,21 @@
313 "#toolchain-build-table",
314 function (item) {
315 var group = 'linaro-android';
316- var pattern = new RegExp("^~" + group + "\/(?!.*201?\.??).*$");
317- return item.getValue('name').search(pattern) == 0 && item.getValue('name').search(/toolchain/) > 0 && item.getValue('name').search(/aarch64/) == -1 ||
318+ var pattern = new RegExp("^~" + group + "\/(?!.*201?\.??).*$");
319+ return item.getValue('name').search(pattern) == 0 && item.getValue('name').search(/toolchain/) > 0 && item.getValue('name').search(/aarch64/) == -1 ||
320 item.getValue('name').search(/galaxynexus-linaro-gcctrunk/) >= 0 ||
321 item.getValue('name').search(/panda-jb-gcctrunk-tilt-tracking-blob/) >= 0;
322 }),
323 makeDT(
324 "#toolchain-release-build-table",
325- function (item) {
326+ function (item) {
327 var group = 'linaro-android';
328 var pattern = new RegExp("^~" + group + "\/.*?(?:201?\.??).*$");
329 return item.getValue('name').search(pattern) == 0 && item.getValue('name').search(/toolchain/) > 0 && item.getValue('name').search(/aarch64/) == -1;
330 }),
331 makeDT(
332 "#toolchain-restricted-build-table",
333- function (item) {
334+ function (item) {
335 var group = 'linaro-android-restricted';
336 var pattern = new RegExp("^~" + group + "\/.*?(?:aarch64).*$");
337 return item.getValue('name').search(pattern) == 0 && item.getValue('name').search(/toolchain/) > 0;
338@@ -448,8 +479,8 @@
339 function (item) { return item.getValue('name').search(/^~linaro-android-archive\//) == 0; }),
340 makeDT("#archive-restricted-build-table",
341 function (item) { return item.getValue('name').search(/^~linaro-android-archive-restricted\//) == 0; }),
342- makeDT("#community-build-table",
343- function (item) {
344+ makeDT("#community-build-table",
345+ function (item) {
346 return item.getValue('name').search(/^~linaro-android-community\//) == 0;})
347 ];
348

Subscribers

People subscribed via source and target branches