Ubuntu CI Dashboard

Merge lp:~cjohnston/qa-dashboard/add-asset-revisions into lp:qa-dashboard

  1. add-asset-revisions
  2. Merge into dev
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 692
Merged at revision: 693
Proposed branch: lp:~cjohnston/qa-dashboard/add-asset-revisions
Merge into: lp:qa-dashboard
Diff against target: 43 lines (+8/-3)
3 files modified
assets_revision.py (+1/-0)
common/templates/layout.html (+1/-1)
qa_dashboard/settings.py (+6/-2)
To merge this branch: bzr merge lp:~cjohnston/qa-dashboard/add-asset-revisions
Reviewer Review Type Date Requested Status
Chris Johnston Approve
PS Jenkins bot continuous-integration Approve
Andy Doan (community) Approve
Review via email: mp+197429@code.launchpad.net

Commit message

Adds ability for the dashboard to use versioned assets from assets.ubuntu.com

Description of the change

This MP adds assets_revision.py which will hold the current version of assets on assets.ubuntu.com, which the dashboard will use to determine where to look for assets files.

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:692
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/265/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/265/rebuild

review: Approve (continuous-integration)
Revision history for this message
Chris Johnston (cjohnston) wrote :

 merge approved

On Mon, Dec 2, 2013 at 3:40 PM, PS Jenkins bot <
<email address hidden>> wrote:

> Review: Approve continuous-integration
>
> PASSED: Continuous integration, rev:692
> http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/265/
> Executed test runs:
>
> Click here to trigger a rebuild:
> http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/265/rebuild
>
> --
>
> https://code.launchpad.net/~cjohnston/qa-dashboard/add-asset-revisions/+merge/197429
> You are the owner of lp:~cjohnston/qa-dashboard/add-asset-revisions.
>

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'assets_revision.py'
2--- assets_revision.py 1970-01-01 00:00:00 +0000
3+++ assets_revision.py 2013-12-02 20:29:42 +0000
4@@ -0,0 +1,1 @@
5+revision = 'r688'
6
7=== modified file 'common/templates/layout.html'
8--- common/templates/layout.html 2013-11-28 15:48:04 +0000
9+++ common/templates/layout.html 2013-12-02 20:29:42 +0000
10@@ -38,7 +38,7 @@
11 <nav role="navigation" class="nav-primary nav-right">
12 <div class="logo">
13 <a class="logo-ubuntu" href='{% url "index" %}'>
14- <img width="118" height="27" src="https://assets.ubuntu.com/sites/ubuntu/latest/u/img/logos/logo-ubuntu-orange.png" alt="Ubuntu" />
15+ <img width="118" height="27" src="//assets.ubuntu.com/sites/ubuntu/latest/u/img/logos/logo-ubuntu-orange.png" alt="Ubuntu" />
16 <span>ci</span>
17 </a>
18 </div>
19
20=== modified file 'qa_dashboard/settings.py'
21--- qa_dashboard/settings.py 2013-11-21 16:58:16 +0000
22+++ qa_dashboard/settings.py 2013-12-02 20:29:42 +0000
23@@ -94,14 +94,18 @@
24 # Example: "/home/media/media.lawrence.com/static/"
25 STATIC_ROOT = 'www/static/'
26
27+STATIC_URL_BASE = '//assets.ubuntu.com/sites/dashboard/'
28+
29+from assets_revision import revision as assets_revision
30+
31 # URL prefix for static files.
32 # Example: "http://media.lawrence.com/static/"
33-STATIC_URL = '/static/'
34+STATIC_URL = STATIC_URL_BASE + assets_revision + '/'
35
36 # URL prefix for admin static files -- CSS, JavaScript and images.
37 # Make sure to use a trailing slash.
38 # Examples: "http://foo.com/static/admin/", "/static/admin/".
39-ADMIN_MEDIA_PREFIX = '/static/admin/'
40+ADMIN_MEDIA_PREFIX = STATIC_URL_BASE + assets_revision + '/admin/'
41
42 # Additional locations of static files
43 STATICFILES_DIRS = (

Subscribers

People subscribed via source and target branches