Checkbox Provider - Resource

Merge plainbox-provider-resource:release into plainbox-provider-resource:master

  1. Git
  2. lp:plainbox-provider-resource
  3. release
  4. Merge into master
Proposed by Sylvain Pineau
Status: Merged
Merge reported by: Sylvain Pineau
Merged at revision: 90c755a1f516077c4068c4ff53348cdc056535ae
Proposed branch: plainbox-provider-resource:release
Merge into: plainbox-provider-resource:master
Diff against target: 24 lines (+2/-2)
2 files modified
.bumpversion.cfg (+1/-1)
manage.py (+1/-1)
Reviewer Review Type Date Requested Status
Devices Certification Bot Needs Fixing
Sylvain Pineau (community) Approve
Review via email: mp+337421@code.launchpad.net

Commit message

Release_2018_Week6

Description of the change

Release_2018_Week6

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

self-approved

review: Approve
Revision history for this message
Devices Certification Bot (ce-certification-qa) wrote :

The merge was fine but running tests failed.

[trusty] starting container
[trusty] Unable to start ephemeral container!
[trusty] stdout:
[trusty] stderr: https://paste.ubuntu.com/26545886/
[trusty] NOTE: unable to execute tests, marked as failed
[trusty] Destroying failed container to reclaim resources
Destroyed container trusty-testing
[xenial] starting container
[xenial] (timing) 0.00user 0.00system 0:00.16elapsed 4%CPU (0avgtext+0avgdata 4892maxresident)k
[xenial] (timing) 376inputs+72outputs (1major+1424minor)pagefaults 0swaps
[xenial] provisioning container
[xenial] (timing) 50.82user 9.06system 2:02.75elapsed 48%CPU (0avgtext+0avgdata 107780maxresident)k
[xenial] (timing) 718568inputs+2323976outputs (490major+1975725minor)pagefaults 0swaps
[xenial-testing] Starting tests...
Found a test script: ./requirements/container-tests-provider-resource-generic
[xenial-testing] container-tests-provider-resource-generic: PASS
[xenial-testing] (timing) 20.56user 1.44system 0:37.81elapsed 58%CPU (0avgtext+0avgdata 64148maxresident)k
[xenial-testing] (timing) 7976inputs+98296outputs (63major+479209minor)pagefaults 0swaps
[xenial-testing] Fixing file permissions in source directory
[xenial-testing] Destroying container
Name: xenial-testing
State: STOPPED

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.bumpversion.cfg b/.bumpversion.cfg
2index aec6c1a..6339998 100644
3--- a/.bumpversion.cfg
4+++ b/.bumpversion.cfg
5@@ -1,5 +1,5 @@
6 [bumpversion]
7-current_version = 0.35.0.dev0
8+current_version = 0.36.0.dev0
9 files = manage.py
10 parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+))?((?P<release>\.?[a-z]+)(?P<N>\d+))?
11 serialize =
12diff --git a/manage.py b/manage.py
13index 78ff927..da5ea33 100755
14--- a/manage.py
15+++ b/manage.py
16@@ -44,7 +44,7 @@ class SourceDistributionCommandExt(SourceDistributionCommand):
17 setup(
18 name='plainbox-provider-resource-generic',
19 namespace='com.canonical.certification',
20- version="0.35.0.dev0",
21+ version="0.36.0.dev0",
22 description=N_("PlainBox resources provider"),
23 gettext_domain='plainbox-provider-resource-generic',
24 deprecated=False, strict=False,

Subscribers

People subscribed via source and target branches

to all changes: