Merge lp:~pfalcon/linaro-android-frontend/private into lp:linaro-android-frontend

[Paul Sokolovsky]

These are the changes to Android Build frontend to support private builds.

This can be seen in action on https://ec2-107-22-102-45.compute-1.amazonaws.com .

Specific changes are:

On UI side:

1. On https://ec2-107-22-102-45.compute-1.amazonaws.com , new "Private builds" tab added, showing private builds (builds starting with "~linaro-android-private/")
2. On https://ec2-107-22-102-45.compute-1.amazonaws.com/new , user is shown with dropdown of Android Build related group he's member on, so he can create build belonging to any group (besides his own personal build). This supersedes previous checkbox to create "official" build.

On backend:

1. "linaro-android-private" Launchpad group membership is queried on login. The semantics of that of that group membership is "can create and edit private Android build".
2. For each new build created, group-specific template job is used, named as "template_$group", e.g. template_linaro-android-official-builders. Previously, we had single template job called "blank".

[Georgy Redkozubov (gesha)]

Looks good.

review: Approve

[Paul Sokolovsky (pfalcon)]

asac also OKed this via IRC.

=== modified file 'android_build/frontend/api.py'
--- android_build/frontend/api.py	2012-02-01 15:48:33 +0000
+++ android_build/frontend/api.py	2012-04-12 17:22:20 +0000
@@ -13,7 +13,7 @@
 from android_build.frontend.views import (
     can_edit,
     is_builder,
-    is_official_builder,
+    group2prefix,
     )
 
 
@@ -184,23 +184,19 @@
 @builder_required
 def new(request):
     try:
-        is_official = request.POST.get('official', 'false') == 'true'
-        if is_official:
-            if not is_official_builder(request):
-                return HttpResponse(
-                    "You are not allowed to create an official build", status=403)
-            ownerName = 'linaro-android'
-        else:
-            ownerName = request.user.username
+        group = request.POST['group']
+        if not request.user.groups.filter(name=group).exists():
+            return HttpResponse(
+                "You are not allowed to create build for requested group", status=403)
+        ownerName = group2prefix(request, group)
+
         buildName = request.POST['name']
         if not valid_build_name.match(buildName):
             return HttpResponse("Invalid name.", status=400)
         new_job_name = ownerName + '_' + buildName
-        xml_base = getJobConfig(settings.TEMPLATE_JOB_NAME)
+        xml_base = getJobConfig(settings.TEMPLATE_JOB_NAME % group)
         if isinstance(xml_base, HttpResponse):
             return xml_base
-        if is_official:
-            xml_base = resetRetentionSettings(xml_base)
         new_config = replaceConfigDefault(xml_base, request.POST['config'])
         resp = postConfig('createItem?name=' + new_job_name, new_config)
         if resp:

=== modified file 'android_build/frontend/views.py'
--- android_build/frontend/views.py	2011-03-25 00:09:03 +0000
+++ android_build/frontend/views.py	2012-04-12 17:22:20 +0000
@@ -7,6 +7,8 @@
 from django.contrib.auth.decorators import (
     login_required
 )
+from django.contrib.auth.models import Group
+
 
 config_template = '''\
 var globalConfig = {
@@ -14,20 +16,35 @@
 }
 '''
 
+def prefix2group(prefix):
+    rev_map = {}
+    # If prefix is in adhoc map, return corresponding group
+    for k, v in settings.GROUP_TO_PREFIX_MAP.iteritems():
+        if v == prefix:
+            return k
+    # Otherwise, check if prefix matches groups known to Django
+    if Group.objects.filter(name=prefix).exists():
+        return prefix
+    # Otherwise, it should be personal build
+    return "linaro-android-builders"
+
+def group2prefix(request, group):
+    val = settings.GROUP_TO_PREFIX_MAP.get(group, group)
+    if val == "$user":
+        return request.user.username
+    return val
+
 def is_builder(request):
     return request.user.groups.filter(name='linaro-android-builders').exists()
 
-def is_official_builder(request):
-    return request.user.groups.filter(
-        name='linaro-android-official-builders').exists()
-
 def can_edit(request, build_name):
     if request.user.is_authenticated():
         owner_name = build_name.split('/')[0][1:]
-        if owner_name == 'linaro-android':
-            return is_official_builder(request)
+        group = prefix2group(owner_name)
+        if group == "linaro-android-builders":
+            return owner_name == request.user.username
         else:
-            return owner_name == request.user.username
+            return request.user.groups.filter(name=group).exists()
     else:
         return False
 
@@ -81,6 +98,6 @@
         return HttpResponse("sorry you are not allowed here", status=403)
     data = {
         'request': request,
-        'canMakeOfficialBuilds': is_official_builder(request),
+        'groups': request.user.groups.all(),
         }
     return _render(request, 'new.html', data)

=== modified file 'android_build/settings.py'
--- android_build/settings.py	2011-04-20 17:38:47 +0000
+++ android_build/settings.py	2012-04-12 17:22:20 +0000
@@ -98,6 +98,11 @@
 FRONTEND_JENKINS_USER = 'admin'
 FRONTEND_JENKINS_PASSWORD = 'password'
 # Name of preconfigured job used as a template for all other jobs
-TEMPLATE_JOB_NAME = 'blank'
+TEMPLATE_JOB_NAME = 'template_%s'
+# We generally use group name as a prefix, but allow for adhoc mapping
+GROUP_TO_PREFIX_MAP = {
+    "linaro-android-builders": "$user",
+    "linaro-android-official-builders": "linaro-android",
+}
 
 USE_OWN_COMBO=False

=== modified file 'android_build/templates/index.html'
--- android_build/templates/index.html	2012-03-29 15:00:38 +0000
+++ android_build/templates/index.html	2012-04-12 17:22:20 +0000
@@ -143,6 +143,7 @@
     <li><a id="official-tab" href="#official-builds">Official Builds</a></li>
     <li><a id="mine-tab" href="#my-builds">My Builds</a></li>
     <li><a id="all-tab" href="#all-builds">All Builds</a></li>
+    <li><a id="private-tab" href="#private-builds">Private Builds</a></li>
   </ul>
   <div>
     <div id="official-builds">
@@ -181,6 +182,20 @@
       </select>
       <div class="build-table" id="all-build-table"></div>
     </div>
+
+    <div id="private-builds">
+      Search: <input class="search" />
+      Outcome: <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="private-build-table"></div>
+    </div>
+
   </div>
 </div>
 {% endblock %}

=== modified file 'android_build/templates/new.html'
--- android_build/templates/new.html	2011-03-15 01:09:15 +0000
+++ android_build/templates/new.html	2012-04-12 17:22:20 +0000
@@ -7,13 +7,26 @@
 <h2>New Build</h2>
 <div>
   <label for="name">Name:</label>
-  ~<span id="ownerName">{{ request.user.username }}</span>/<input id="name" value="">
+  ~<select id="group">
+{% for g in groups %}
+<option value="{{g.name}}">
+{% if g.name == "linaro-android-builders" %}
+  {{request.user.username}}
+{% else %}
+  {% if g.name == "linaro-android-official-builders" %}
+    linaro-android
+  {% else %}
+    {{g.name}}
+  {% endif %}
+{% endif %}
+</option>
+{% endfor %}
+</select>/<input id="name" value="">
   <span id="taken-warning" class="hidden" style="color: red">name taken</span>
   <span id="invalid-name-warning" class="hidden" style="color: red">invalid name</span>
   <br />
-  {% if canMakeOfficialBuilds %}
-  <input type="checkbox" id="official" value="official" /><label for="official">Create an official build</label><br />
-  {% endif %}
+  <br />
+
   <textarea id="configuration" cols="80" rows="10">MANIFEST_REPO=git://android.git.kernel.org/platform/manifest.git
 MANIFEST_BRANCH=master
 MANIFEST_FILENAME=default.xml

=== modified file 'group-fixture.json'
--- group-fixture.json	2011-03-08 01:06:18 +0000
+++ group-fixture.json	2012-04-12 17:22:20 +0000
@@ -14,5 +14,13 @@
       },
       "pk" : 2,
       "model" : "auth.group"
+   },
+   {
+      "fields" : {
+         "permissions" : [],
+         "name" : "linaro-android-private"
+      },
+      "pk" : 3,
+      "model" : "auth.group"
    }
 ]

=== modified file 'static/index.js'
--- static/index.js	2011-03-17 02:41:11 +0000
+++ static/index.js	2012-04-12 17:22:20 +0000
@@ -219,7 +219,11 @@
          function (item) { return item.getValue('name').search(userRegexp) == 0; } :
          function (item) { return false; })
       ),
-      makeDT("#all-build-table")
+      makeDT("#all-build-table"),
+      makeDT(
+        "#private-build-table",
+        function (item) { return item.getValue('name').search(/^~linaro-android-private\//) == 0; }
+      )
     ];
 
     function extractJobsFromResponse(data) {

=== modified file 'static/new.js'
--- static/new.js	2011-03-17 01:37:06 +0000
+++ static/new.js	2012-04-12 17:22:20 +0000
@@ -25,13 +25,13 @@
             }
             var j = 0;
             var tmp;
-            var names = getOfficial() ? official_used_names : user_used_names;
+            var names = user_used_names;
             while (names.indexOf(tmp = 'testBuild-' + j.toString()) >= 0) {
               j++;
             }
             Y.one('#name').set('value', tmp);
             checkName = function (e) {
-              var names = getOfficial() ? official_used_names : user_used_names;
+              var names = user_used_names;
               var curValue = Y.one('#name').get('value');
               if (curValue.search(/^[a-z0-9][a-z0-9\+\.\-]*$/) < 0) {
                 Y.one('#taken-warning').addClass('hidden');
@@ -52,11 +52,10 @@
     Y.io.header('X-CSRFToken', Y.Cookie.get("csrftoken"));
 
     function saveBuild(e, buildNow) {
-      Y.log(getOfficial());
       var data = {
         config: Y.one('#configuration').get('value'),
         name: Y.one('#name').get('value'),
-        official: getOfficial()
+        group: Y.one('#group').get('value')
       };
       if (buildNow) {
         data.buildNow = true;
@@ -80,22 +79,6 @@
       );
     }
 
-    function officialChange (e) {
-      if (getOfficial()) {
-        Y.one('#ownerName').setContent("linaro-android");
-      } else {
-        Y.one('#ownerName').setContent(globalConfig.userName);
-      }
-      checkName && checkName();
-    }
-
-    Y.all('#official').on('change', officialChange);
-    function getOfficial() {
-      var officialNode = Y.one('#official');
-      return officialNode && officialNode.get('checked');
-    }
-    officialChange();
-
     Y.on(
       'click',
       function (e) {