Merge lp:~joetalbott/helipad/ci_cu2d_results into lp:helipad/ci

[Joe Talbott]

Daily Release - For the time being use the cu2d results page.

* This was discussed at the QA/CI/Phonedations Sprint in Lexington September 2013

Daily Release - For the time being use the cu2d results page.

* This was discussed at the QA/CI/Phonedations Sprint in Lexington September 2013

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:46
http://s-jenkins:8080/job/helipad-ci-ci/71/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/helipad-ci-ci/71/rebuild

review: Approve (continuous-integration)

[Chris Johnston (cjohnston)]

I think you are missing a div grid_15

[Didier Roche-Tolomelli (didrocks)]

good enough for me ;) just check with Chris if you need that div, I like this way, won't mind the div either :p

review: Approve

[Joe Talbott (joetalbott)]

Doesn't seem to change anything by adding it.

[lp:~joetalbott/helipad/ci_cu2d_results]

47. By Joe Talbot <email address hidden> on 2013-09-27

Daily Release - Add grid_15 for better margins

[Joe Talbott (joetalbott)]

Scratch that. Pushed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:47
http://s-jenkins:8080/job/helipad-ci-ci/72/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/helipad-ci-ci/72/rebuild

review: Approve (continuous-integration)

[Chris Johnston (cjohnston)]

review: Approve

[Francis Ginther (fginther)]

I missed the fun, but also approve

review: Approve

=== added file 'templates/ci/cu2d_results.html'
--- templates/ci/cu2d_results.html	1970-01-01 00:00:00 +0000
+++ templates/ci/cu2d_results.html	2013-09-27 15:10:03 +0000
@@ -0,0 +1,14 @@
+{% extends "ci/ci_layout.html" %}
+{% load url from future %}
+{% load dashboard_extras ci_extras percentage %}
+
+{% block page_name %}Daily release status for {% if show_filter %}{{ show_filter }}{% else %}all stacks{% endif %}{% endblock %}
+
+{% block content %}
+<div class="grid_15">
+  <pre>
+  {{ content }}
+  </pre>
+</div>
+{% endblock content %}
+

=== modified file 'urls_daily.py'
--- urls_daily.py	2013-07-23 17:46:15 +0000
+++ urls_daily.py	2013-09-27 15:10:03 +0000
@@ -24,5 +24,5 @@
 
 urlpatterns = patterns(
     'ci.views',
-    url(r'^$', 'stack_list', name='ci_daily_overview'),
+    url(r'^$', 'display_cu2d_results', name='ci_daily_overview'),
 )

=== modified file 'views.py'
--- views.py	2013-08-08 19:23:51 +0000
+++ views.py	2013-09-27 15:10:03 +0000
@@ -13,6 +13,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import urllib2
+
 from django.template import RequestContext
 from django.shortcuts import get_object_or_404, render_to_response
 
@@ -60,6 +62,23 @@
     )
 
 
+def display_cu2d_results(request):
+    response = urllib2.urlopen(
+        'http://people.canonical.com/~platform/cu2d/results'
+    )
+    content = response.read()
+
+    data = dict(
+        content=content,
+    )
+
+    return render_to_response(
+        'ci/cu2d_results.html',
+        data,
+        RequestContext(request)
+    )
+
+
 def stack_list(request):
     show_filter = request.GET.get('show')
     release_list = Release.objects.all()