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

[Milo Casagrande]

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

Staging istance is being prepared to test it.

[Milo Casagrande (milo)]

Sandbox with the changes applied is here:

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

[Georgy Redkozubov (gesha)]

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

[Milo Casagrande (milo)]

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]

316. By Milo Casagrande on 2013-03-22

Renumbered and reworked json fixtures.

=== modified file 'android_build/templates/index.html'
--- android_build/templates/index.html	2013-03-19 09:17:49 +0000
+++ android_build/templates/index.html	2013-03-22 14:01:32 +0000
@@ -302,6 +302,9 @@
                     <li><a id="msamsung" href="#msamsung"><em>Samsung</em></a></li>
                     <li><a id="marm" href="#marm"><em>ARM</em></a></li>
                     <li><a id="mste" href="#mste"><em>ST-E</em></a></li>
+                    <li>
+                        <a id="mhisilicon" href="#mhisilicon"><em>Hisilicon</em></a>
+                    </li>
                 </ul>
                 <div>
                     <div id="mti">
@@ -356,7 +359,7 @@
                             <ul>
                                 <li><a href="#msamsungdaily-tab"><em>Daily</em></a></li>
                                 <li><a href="#msamsungrelease-tab"><em>Release</em></a></li>
-                                <li><a href="#msamsungestricted-tab"><em>Restricted</em></a></li>
+                                <li><a href="#msamsungrestricted-tab"><em>Restricted</em></a></li>
                             </ul>
                             <div>
                                 <div id=msamsungdaily-tab>
@@ -398,7 +401,7 @@
                             </div>
                         </div>
                     </div>
-                    <div id="arm">
+                    <div id="marm">
                         <div id="marmtabs">
                             <ul>
                                 <li><a href="#marmdaily-tab"><em>Daily</em></a></li>
@@ -445,7 +448,7 @@
                             </div>
                         </div>
                     </div>
-                    <div id="ste">
+                    <div id="mste">
                         <div id="mstetabs">
                             <ul>
                                 <li><a href="#mstedaily-tab"><em>Daily</em></a></li>
@@ -492,6 +495,53 @@
                             </div>
                         </div>
                     </div>
+                    <div id="mhisilicon">
+                        <div id="mhisilicontabs">
+                            <ul>
+                                <li><a href="#mhisilicondaily-tab"><em>Daily</em></a></li>
+                                <li><a href="#mhisiliconrelease-tab"><em>Release</em></a></li>
+                                <li><a href="#mhisiliconrestricted-tab"><em>Restricted</em></a></li>
+                            </ul>
+                            <div>
+                                <div id=mhisilicondaily-tab>
+                                    Search: <input class="search" />
+                                    Status: <select>
+                                      <option value="Any" selected="selected">Any</option>
+                                      <option value="OK">Success</option>
+                                      <option value="FAILED">Failure</option>
+                                      <option value="ABORTED">Aborted</option>
+                                      <option value="RUNNING">Building</option>
+                                      <option value="">Never built</option>
+                                    </select>
+                                    <div class="build-table" id="member-hisilicon-build-table"></div>
+                                </div>
+                                <div id=mhisiliconrelease-tab>
+                                    Search: <input class="search" />
+                                    Status: <select>
+                                      <option value="Any" selected="selected">Any</option>
+                                      <option value="OK">Success</option>
+                                      <option value="FAILED">Failure</option>
+                                      <option value="ABORTED">Aborted</option>
+                                      <option value="RUNNING">Building</option>
+                                      <option value="">Never built</option>
+                                    </select>
+                                    <div class="build-table" id="member-hisilicon-release-build-table"></div>
+                                </div>
+                                <div id=mhisiliconrestricted-tab>
+                                    Search: <input class="search" />
+                                    Status: <select>
+                                      <option value="Any" selected="selected">Any</option>
+                                      <option value="OK">Success</option>
+                                      <option value="FAILED">Failure</option>
+                                      <option value="ABORTED">Aborted</option>
+                                      <option value="RUNNING">Building</option>
+                                      <option value="">Never built</option>
+                                    </select>
+                                    <div class="build-table" id="member-hisilicon-restricted-build-table"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
 
=== modified file 'group-fixture.json'
--- group-fixture.json	2013-01-22 05:19:30 +0000
+++ group-fixture.json	2013-03-22 14:01:32 +0000
@@ -110,5 +110,21 @@
       },
       "pk" : 14,
       "model" : "auth.group"
+   },
+   {
+      "fields" : {
+         "permissions" : [],
+         "name" : "linaro-android-member-hisilicon"
+      },
+      "pk" : 15,
+      "model" : "auth.group"
+   },
+   {
+      "fields" : {
+         "permissions" : [],
+         "name" : "linaro-android-member-hisilicon-restricted"
+      },
+      "pk" : 16,
+      "model" : "auth.group"
    }
 ]
 
=== modified file 'static/index.js'
--- static/index.js	2013-01-23 16:00:30 +0000
+++ static/index.js	2013-03-22 14:01:32 +0000
@@ -12,6 +12,8 @@
     msamsung_tabview.render();
     marm_tabview = new Y.TabView({ srcNode: '#marmtabs' });
     marm_tabview.render();
+    mhisilicon_tabview = new Y.TabView({ srcNode: '#mhisilicontabs' });
+    mhisilicon_tabview.render();
     msubteam_tabview = new Y.TabView({ srcNode: '#msubteams' });
     msubteam_tabview.render();
     asubteam_tabview = new Y.TabView({ srcNode: '#asubteams' });
@@ -153,6 +155,18 @@
         }
       });
 
+     mhisilicon_tabview.on(
+      'render',
+      function (e) {
+        if (!globalConfig.userName || !in_array(groupsArray, 'linaro-android-member-hisilicon-restricted')) {
+          var restrictedBuildsTab = mhisilicon_tabview.item(2);
+          restrictedBuildsTab.on('click', function (e) { e.preventDefault(); });
+          var restrictedlink = restrictedBuildsTab.get('boundingBox').one('a');
+          restrictedlink.setStyle('color', 'grey');
+          restrictedlink.setAttribute('href', globalConfig.loginURL + '?next=' + location.pathname + '%23teams=mhisiliconrestricted');
+        }
+      });
+
      team_tabview.on(
       'render',
       function (e) {
@@ -165,7 +179,7 @@
         }
       });
 
-    if ((history.get('teams') == 'user' && !globalConfig.userName) || 
+    if ((history.get('teams') == 'user' && !globalConfig.userName) ||
        (history.get('teams') == 'member' && !globalConfig.userName)) {
       logInAndGoToMyBuilds();
     } else {
@@ -257,9 +271,9 @@
       });
 
     function formatCell (o) {
-      // REVISIT: The current format is builds/teamname/jobname 
+      // REVISIT: The current format is builds/teamname/jobname
       // ex: ~linaro-android-restricted/vexpress-rtsm-isw-jb-test
-      // This must change to builds/teamname/buildtype/jobname 
+      // This must change to builds/teamname/buildtype/jobname
       //ex: ~linaro-android-official-builders/~linaro-android-restricted/vexpress-rtsm-isw-jb-test
       return '<a href="builds/' + o.data.name + '/">' + o.value + '</a>';
     }
@@ -327,9 +341,9 @@
     var tables = [
       makeDT(
         "#engineering-daily-build-table",
-        function (item) { 
+        function (item) {
             var group = 'linaro-android';
-            var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");  
+            var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
             return item.getValue('name').search(pattern) == 0 && item.getValue('name').search(/toolchain/) == -1 &&
             item.getValue('name').search(/galaxynexus-linaro-gcctrunk/) == -1 &&
             item.getValue('name').search(/panda-jb-gcctrunk-tilt-tracking-blob/) == -1;
@@ -337,83 +351,100 @@
         }),
       makeDT(
         "#engineering-release-build-table",
-        function (item) { 
+        function (item) {
             var group = 'linaro-android';
             var pattern = new RegExp("^~" + group + "\/.*?(?:release).*$");
             return item.getValue('name').search(pattern) == 0 && item.getValue('name').search(/toolchain/) == -1;
        }),
       makeDT(
         "#engineering-restricted-build-table",
-        function (item) { 
-            return item.getValue('name').search(/^~linaro-android-restricted\//) == 0 && item.getValue('name').search(/toolchain/) == -1; 
+        function (item) {
+            return item.getValue('name').search(/^~linaro-android-restricted\//) == 0 && item.getValue('name').search(/toolchain/) == -1;
       }),
       makeDT(
         "#member-ti-build-table",
-        function (item) { 
+        function (item) {
             var group = 'linaro-android-member-ti';
-            var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");  
+            var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
             return item.getValue('name').search(pattern) == 0;
       }),
       makeDT(
         "#member-ti-release-build-table",
-        function (item) { 
-            return item.getValue('name').search(/^~linaro-android-member-ti\/.*?(?:release).*$/) == 0; 
+        function (item) {
+            return item.getValue('name').search(/^~linaro-android-member-ti\/.*?(?:release).*$/) == 0;
       }),
       makeDT(
         "#member-ti-restricted-build-table",
-        function (item) { 
+        function (item) {
             return item.getValue('name').search(/^~linaro-android-member-ti-restricted\//) == 0;
       }),
       makeDT(
         "#member-samsung-build-table",
-        function (item) { 
+        function (item) {
            var group = 'linaro-android-member-samsung';
-           var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");  
+           var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
            return item.getValue('name').search(pattern) == 0;
       }),
       makeDT(
         "#member-samsung-release-build-table",
-        function (item) { 
-           return item.getValue('name').search(/^~linaro-android-member-samsung\/.*?(?:release).*$/) == 0; 
+        function (item) {
+           return item.getValue('name').search(/^~linaro-android-member-samsung\/.*?(?:release).*$/) == 0;
       }),
       makeDT(
         "#member-samsung-restricted-build-table",
-        function (item) { 
-           return item.getValue('name').search(/^~linaro-android-member-samsung-restricted\//) == 0; 
+        function (item) {
+           return item.getValue('name').search(/^~linaro-android-member-samsung-restricted\//) == 0;
       }),
       makeDT(
         "#member-arm-build-table",
-        function (item) { 
+        function (item) {
            var group = 'linaro-android-member-arm';
-           var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");  
+           var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
            return item.getValue('name').search(pattern) == 0;
       }),
       makeDT(
         "#member-arm-release-build-table",
-        function (item) { 
-             return item.getValue('name').search(/^~linaro-android-member-arm\/.*?(?:release).*$/) == 0; 
+        function (item) {
+             return item.getValue('name').search(/^~linaro-android-member-arm\/.*?(?:release).*$/) == 0;
       }),
       makeDT(
         "#member-arm-restricted-build-table",
         function (item) {
-              return item.getValue('name').search(/^~linaro-android-member-arm-restricted\//) == 0; 
+              return item.getValue('name').search(/^~linaro-android-member-arm-restricted\//) == 0;
       }),
       makeDT(
         "#member-ste-build-table",
-        function (item) { 
+        function (item) {
            var group = 'linaro-android-member-ste';
-           var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");  
+           var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
            return item.getValue('name').search(pattern) == 0;
       }),
       makeDT(
         "#member-ste-release-build-table",
-        function (item) { 
-             return item.getValue('name').search(/^~linaro-android-member-ste\/.*?(?:release).*$/) == 0; 
+        function (item) {
+             return item.getValue('name').search(/^~linaro-android-member-ste\/.*?(?:release).*$/) == 0;
       }),
       makeDT(
         "#member-ste-restricted-build-table",
-        function (item) { 
-             return item.getValue('name').search(/^~linaro-android-member-ste-restricted\//) == 0; 
+        function (item) {
+             return item.getValue('name').search(/^~linaro-android-member-ste-restricted\//) == 0;
+      }),
+      makeDT(
+        "#member-hisilicon-build-table",
+        function (item) {
+           var group = 'linaro-android-member-hisilicon';
+           var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
+           return item.getValue('name').search(pattern) == 0;
+      }),
+      makeDT(
+        "#member-hisilicon-release-build-table",
+        function (item) {
+             return item.getValue('name').search(/^~linaro-android-member-hisilicon\/.*?(?:release).*$/) == 0;
+      }),
+      makeDT(
+        "#member-hisilicon-restricted-build-table",
+        function (item) {
+             return item.getValue('name').search(/^~linaro-android-member-hisilicon-restricted\//) == 0;
       }),
       makeDT(
         "#user-build-table",
@@ -425,21 +456,21 @@
         "#toolchain-build-table",
         function (item) {
             var group = 'linaro-android';
-            var pattern = new RegExp("^~" + group + "\/(?!.*201?\.??).*$");  
-            return item.getValue('name').search(pattern) == 0 && item.getValue('name').search(/toolchain/) > 0 && item.getValue('name').search(/aarch64/) == -1 || 
+            var pattern = new RegExp("^~" + group + "\/(?!.*201?\.??).*$");
+            return item.getValue('name').search(pattern) == 0 && item.getValue('name').search(/toolchain/) > 0 && item.getValue('name').search(/aarch64/) == -1 ||
               item.getValue('name').search(/galaxynexus-linaro-gcctrunk/) >= 0 ||
               item.getValue('name').search(/panda-jb-gcctrunk-tilt-tracking-blob/) >= 0;
       }),
       makeDT(
         "#toolchain-release-build-table",
-        function (item) { 
+        function (item) {
             var group = 'linaro-android';
             var pattern = new RegExp("^~" + group + "\/.*?(?:201?\.??).*$");
             return item.getValue('name').search(pattern) == 0 && item.getValue('name').search(/toolchain/) > 0 && item.getValue('name').search(/aarch64/) == -1;
       }),
       makeDT(
         "#toolchain-restricted-build-table",
-        function (item) { 
+        function (item) {
             var group = 'linaro-android-restricted';
             var pattern = new RegExp("^~" + group + "\/.*?(?:aarch64).*$");
             return item.getValue('name').search(pattern) == 0 && item.getValue('name').search(/toolchain/) > 0;
@@ -448,8 +479,8 @@
         function (item) { return item.getValue('name').search(/^~linaro-android-archive\//) == 0; }),
       makeDT("#archive-restricted-build-table",
         function (item) { return item.getValue('name').search(/^~linaro-android-archive-restricted\//) == 0; }),
-      makeDT("#community-build-table", 
-         function (item) { 
+      makeDT("#community-build-table",
+         function (item) {
              return item.getValue('name').search(/^~linaro-android-community\//) == 0;})
     ];