Merge lp://staging/~cjohnston/qa-dashboard/make into lp://staging/qa-dashboard

Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 685
Merged at revision: 685
Proposed branch: lp://staging/~cjohnston/qa-dashboard/make
Merge into: lp://staging/qa-dashboard
Diff against target: 13 lines (+9/-0)
1 file modified
Makefile (+9/-0)
To merge this branch: bzr merge lp://staging/~cjohnston/qa-dashboard/make
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Andy Doan (community) Approve
Chris Johnston Needs Resubmitting
Joe Talbott Approve
Review via email: mp+193456@code.staging.launchpad.net

Commit message

Begin adding a Makefile for the charm to use

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

FAILED: Continuous integration, rev:670
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cjohnston/qa-dashboard/make/+merge/193456/+edit-commit-message

http://10.97.0.26:8080/job/dashboard-ci/246/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/246/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Andy Doan (doanac) wrote :

can you elaborate a bit on how this tarball fits?

also - bzr has abilities like this:

 http://doc.bazaar.canonical.com/beta/en/user-guide/releasing_a_project.html

If the makefile is still necessary. It probably should be a bit smarter like:

TAR_EXTRA =

ifneq ($(strip $(STRIP_BZR)),)
 TAR_EXTRA = --exclude .bzr
endif

../ci-dashboard.tgz:
 tar czf $@ $(TAR_EXTRA) .

../ci-dashboard-r`bzr revno`.tgz: ../ci-dashboard.tgz
 cp $< $@

all: ../ci-dashboard.tgz

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

PASSED: Continuous integration, rev:671
http://10.97.0.26:8080/job/dashboard-ci/247/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/247/rebuild

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

Andy's suggestion filters out the .bzr directory. Let me also suggest we do this, but for a different reason: Juju's disk usage grows quite significantly over time if your payload is large and you do many deployments. This is: https://bugs.launchpad.net/juju-core/+bug/1220269.

The U1 team (and the lp:errors charm) are filtering out .bzr for this reason.

Revision history for this message
Chris Johnston (cjohnston) :
review: Needs Resubmitting
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:672
http://10.97.0.26:8080/job/dashboard-ci/248/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/248/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andy Doan (doanac) wrote :

I'm still not a fan of your "tarball" and "tarball-with-revision" targets. If those are "must" for juju, then at a minimum "tarball-with-revision" should also be listed with .PHONY. But I'd still write the makefile correctly unless there's some good reason I'm not seeing

672. By Joe Talbot <email address hidden>

[r=Andy Doan, PS Jenkins bot] Don't allow update and branch-update scripts to run at the same time. from Joe Talbott

673. By Chris Johnston

2013.11.01

674. By Joe Talbot <email address hidden>

[r=Andy Doan, PS Jenkins bot] Don't allow update and branch-update scripts to run at the same time. from Joe Talbott

675. By Chris Johnston

2013.11.01a

676. By Joe Talbot <email address hidden>

[r=PS Jenkins bot, Andy Doan] update scripts - Convert to python and add txstatsd metrics. from Joe Talbott

677. By Chris Johnston

[r=Joe Talbott, PS Jenkins bot] Fix flake8 issues, remove duplicate calls for updating power from Chris Johnston

678. By Joe Talbot <email address hidden>

[r=Chris Johnston, Andy Doan] Fix jenkins job object matching.

We were getting duplicate key errors from the DB due to matching on name and url, but only name is the primary key.

Start using the python version of branch-update. from Joe Talbott

679. By Joe Talbot <email address hidden>

[r=Chris Johnston] branch update - Change into the repo directory before calling bzr. from Joe Talbott

680. By Joe Talbot <email address hidden>

[r=Andy Doan] Update to use 'cwd' in subprocess calls. from Joe Talbott

681. By Paul Larson

[r=Chris Johnston, PS Jenkins bot] Use hostnames instead of IP addresses for the jenkins servers when logged in. from Paul Larson

682. By Chris Johnston

2013.11.19

683. By Andy Doan

[r=Chris Johnston, PS Jenkins bot, Joe Talbott] This provides the base model and view updates required for live-status of smoke jobs. It adds a new "status" field to results so we can see if they are:

 queued: waiting for jenkins to run the test
 running: jenkins is running the test
 syncing: the test is complete with results, but hasn't made it to the public jenkins (and pulled by our scripts)
 complete: its gone through the pull-script and we have all its job artifacts from Andy Doan

684. By Chris Johnston

[r=Chris Johnston, Joe Talbott] Change branch-update.py and ci-dashboard-update.py to +x from Chris Johnston

Revision history for this message
Joe Talbott (joetalbott) :
review: Approve
685. By Chris Johnston

Adds makefile to the dashboard

Revision history for this message
Chris Johnston (cjohnston) wrote :

 review resubmit

On Mon, Nov 25, 2013 at 3:18 PM, Joe Talbott <email address hidden>wrote:

> Review: Approve
>
>
> --
> https://code.launchpad.net/~cjohnston/qa-dashboard/make/+merge/193456
> You are the owner of lp:~cjohnston/qa-dashboard/make.
>

review: Needs Resubmitting
Revision history for this message
Andy Doan (doanac) :
review: Approve
Revision history for this message
Chris Johnston (cjohnston) wrote :

review approve
merge approve
On Nov 25, 2013 3:30 PM, "Chris Johnston" <email address hidden>
wrote:

> Review: Resubmit
>
> review resubmit
>
>
>
> On Mon, Nov 25, 2013 at 3:18 PM, Joe Talbott <<email address hidden>
> >wrote:
>
> > Review: Approve
> >
> >
> > --
> > https://code.launchpad.net/~cjohnston/qa-dashboard/make/+merge/193456
> > You are the owner of lp:~cjohnston/qa-dashboard/make.
> >
>
> --
> https://code.launchpad.net/~cjohnston/qa-dashboard/make/+merge/193456
> You are the owner of lp:~cjohnston/qa-dashboard/make.
>

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

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/260/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