Merge lp://qastaging/~joetalbott/qa-dashboard/charm_support into lp://qastaging/qa-dashboard

Proposed by Joe Talbott
Status: Merged
Approved by: Joe Talbott
Approved revision: 773
Merged at revision: 762
Proposed branch: lp://qastaging/~joetalbott/qa-dashboard/charm_support
Merge into: lp://qastaging/qa-dashboard
Diff against target: 581 lines (+333/-35)
18 files modified
Makefile (+20/-8)
README.install (+2/-0)
cm.py (+193/-0)
common/tests/test_settings.py (+12/-3)
common/utils.py (+2/-2)
config-manager.txt (+1/-0)
dependencies.txt (+16/-0)
manage.py (+3/-0)
qa_dashboard/paths.py (+42/-0)
qa_dashboard/settings.py (+4/-0)
qa_dashboard/settings_base.py (+17/-5)
qa_dashboard/settings_devel.py (+6/-0)
qa_dashboard/wsgi.py (+3/-0)
requirements.txt (+1/-16)
scripts/branch-update.py (+3/-0)
scripts/ci-dashboard-update.py (+3/-0)
smokeng/views.py (+1/-1)
tar_excludes.txt (+4/-0)
To merge this branch: bzr merge lp://qastaging/~joetalbott/qa-dashboard/charm_support
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Evan (community) Approve
Review via email: mp+231628@code.qastaging.launchpad.net

Commit message

Add support needed for the soon to be released CI Dashboard Charm.

Description of the change

Add support needed for the soon to be released CI Dashboard Charm.

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

FAILED: Continuous integration, rev:770
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/359/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Evan (ev) wrote :

Looks good. I like the use of pinned dependencies here.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:771
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/361/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:771
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/362/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:771
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/363/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:771
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/364/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:771
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/365/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:771
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/366/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:771
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/367/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:771
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/368/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:771
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/369/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:771
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/370/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:771
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/371/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:771
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/372/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:771
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/373/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

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

Attempt to merge into lp:qa-dashboard failed due to conflicts:

text conflict in eventstat/dashboard.py

773. By Joe Talbott

merge with trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches