Merge ~sylvain-pineau/plainbox-provider-certification-server:pmr_hook into plainbox-provider-certification-server:master

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: f8261ef33aed04cd6e187f6494e66481ccf533ea
Merged at revision: e30dc42af6e06f92e58f50ed2b801d836e7b1cea
Proposed branch: ~sylvain-pineau/plainbox-provider-certification-server:pmr_hook
Merge into: plainbox-provider-certification-server:master
Diff against target: 29 lines (+11/-0)
3 files modified
.pmr-merge-hook (+8/-0)
requirements/deb-core.txt (+2/-0)
requirements/repo-core.txt (+1/-0)
Reviewer Review Type Date Requested Status
Paul Larson Approve
Sylvain Pineau (community) Needs Fixing
Review via email: mp+305595@code.launchpad.net

Description of the change

New pmr hook to run the provider validation before merging new code

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

Neat! Is there a good way to test this without actually merging it?

Revision history for this message
Jeff Lane  (bladernr) wrote :

Since I'm new to this, what to the files in /requirements actually to?

For example, why does repo-core.txt specify the dev ppa?

Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

@Paul, I can patch my pmr instance to do a dry run and paste the logs here for reference.

@Jeff, to validate the server provider we need to have the checkbox one as all job ids in your test plans are referencing jobs from this base provider. Pulling from checkbox trunk might sound like a good idea but bzr trunk will soon move to individual git repos. So that's not an option. Ideally I should develop the checkbox provider from its got repo (but we don't have it yet). So a workaround is to pull it from the daily builds.

that way we can validate the provider.

Note that we need both the checkbox provider and plainbox, the first the the above reason the second as it implements the modules imported by manage.py.

Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

Set to approved just for the dry run

review: Approve
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

I tried to merge it but there are some problems. Typically you want to merge or rebase and try again.

review: Needs Fixing
Revision history for this message
Paul Larson (pwlars) wrote :

Yeah, I think that highlights something that we (or someone) needs to fix with PMR too. I find it quite annoying that it sends a separate email saying "there were problems" leaving you to figure it out. Tarmac handles that a lot better I think.

Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

the log from the dry run: http://pastebin.ubuntu.com/23174060/

It took a while as in the meantime I apply the patch that Colin wrote to reword the commit msg. And it failed because I didn't set a git user nor email for pmr.

I'll update my charm to have that set up automatically

Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :
Revision history for this message
Paul Larson (pwlars) wrote :

nice, looks like it's working well now. +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.pmr-merge-hook b/.pmr-merge-hook
2new file mode 100755
3index 0000000..9c894b0
4--- /dev/null
5+++ b/.pmr-merge-hook
6@@ -0,0 +1,8 @@
7+#!/bin/sh
8+
9+set -e
10+
11+git clone https://git.launchpad.net/~checkbox-dev/checkbox/+git/support
12+time -o timing.dat ./support/test-in-lxc.sh
13+echo "Complete test time:"
14+cat timing.dat
15diff --git a/requirements/deb-core.txt b/requirements/deb-core.txt
16new file mode 100644
17index 0000000..e26bc74
18--- /dev/null
19+++ b/requirements/deb-core.txt
20@@ -0,0 +1,2 @@
21+plainbox
22+plainbox-provider-checkbox
23diff --git a/requirements/repo-core.txt b/requirements/repo-core.txt
24new file mode 100644
25index 0000000..9865f44
26--- /dev/null
27+++ b/requirements/repo-core.txt
28@@ -0,0 +1 @@
29+checkbox-dev/ppa

Subscribers

People subscribed via source and target branches