Ubuntu CI Dashboard

Merge lp://staging/~joetalbott/qa-dashboard/fix_script_locking into lp://staging/qa-dashboard

  1. fix_script_locking
  2. Merge into dev
Proposed by Joe Talbott
Status: Merged
Approved by: Chris Johnston
Approved revision: 662
Merged at revision: 674
Proposed branch: lp://staging/~joetalbott/qa-dashboard/fix_script_locking
Merge into: lp://staging/qa-dashboard
Diff against target: 58 lines (+7/-9)
3 files modified
deployment/apache-mod-wsgi/README (+2/-2)
scripts/branch-update.sh (+4/-6)
scripts/qa-dashboard-update-fast.sh (+1/-1)
To merge this branch: bzr merge lp://staging/~joetalbott/qa-dashboard/fix_script_locking
Reviewer Review Type Date Requested Status
Andy Doan (community) Approve
PS Jenkins bot continuous-integration Approve
Joe Talbott Needs Resubmitting
Review via email: mp+192235@code.staging.launchpad.net

Commit message

Don't allow update and branch-update scripts to run at the same time.

Description of the change

Don't allow update and branch-update scripts to run at the same time.

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

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

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

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

i found it odd the locks were numbered:

  200, 202, 201

But not a big deal.

do we really need to call "scripts/qa-dashboard-update.sh" for a branch-update?

review: Approve
Revision history for this message
Joe Talbott (joetalbott) wrote :

On Tue, Oct 22, 2013 at 09:31:49PM -0000, Andy Doan wrote:
> Review: Approve
>
> i found it odd the locks were numbered:
>
> 200, 202, 201
>
> But not a big deal.
>
> do we really need to call "scripts/qa-dashboard-update.sh" for a branch-update?

I was wondering the same thing. If there is consensus I'll remove it
here too.

Though I think the case could happen where an update-branch runs and
blocks an update (which exits) so the update won't run for another hour
which makes a 2 hour gap without new results. But it's not smoke so it
might be okay. Though smoke could take 30 minutes.

Comments?

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

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

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

review: Approve (continuous-integration)
Revision history for this message
Joe Talbott (joetalbott) :
review: Needs Resubmitting
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

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

+1

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

The attempt to merge lp:~joetalbott/qa-dashboard/fix_script_locking into lp:qa-dashboard failed. Below is the output from the failed tests.

Creating test database for alias 'default'...
Type 'yes' if you would like to try deleting the test database 'test_qa_dashboard', or 'no' to cancel:
Got an error creating the test database: database "test_qa_dashboard" already exists

EOFError: EOF when reading a line

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