Merge lp://qastaging/~roadmr/cdts/update-piglit-ppa into lp://qastaging/cdts

Proposed by Daniel Manrique
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 2357
Merged at revision: 2357
Proposed branch: lp://qastaging/~roadmr/cdts/update-piglit-ppa
Merge into: lp://qastaging/cdts
Diff against target: 16 lines (+6/-3)
1 file modified
plainbox-gui/offline-tarballs/ppas.txt (+6/-3)
To merge this branch: bzr merge lp://qastaging/~roadmr/cdts/update-piglit-ppa
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Zygmunt Krynicki (community) Approve
Sylvain Pineau (community) Needs Information
Review via email: mp+206555@code.qastaging.launchpad.net

Commit message

Fixes the linked bug by using a new, more up-to-date piglit PPA which does include the libwaffle dependency.

Description of the change

Fixes the linked bug by using a new, more up-to-date piglit PPA which does include the libwaffle dependency.

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

do we magically replace YOUR_UBUNTU_VERSION_HERE? (where for the rest of this file it's @@RELEASE@@)

review: Needs Information
Revision history for this message
Daniel Manrique (roadmr) wrote :

Yes, this syntax is handled by dpkg-offline and both options are supported:

        Additional PPAs can be specified in a file that will be added to the
        apt sources prior to installation. The special @@RELEASE@@ variable or
        the YOUR_UBUNTU_VERSION_HERE string will be substituted by the image's
        release name. Private PPAs are supported, using the encrypted password
        syntax as provided by launchpad's PPA details page; they can be copied
        verbatim from Launchpad PPA details pages thanks to the above-mentioned
        variable substitution.

Anyway, to be consistent I updated the @@RELEASE@@ instances to use YOUR_UBUNTU_VERSION_HERE, as this is the preferred notation. @@RELEASE@@ is a relic from the old kvm-based dpkg-offline.

Thanks!

review: Needs Resubmitting
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

let's take it

*though* I would use the stable PPA (unrelated to this proposal really)

review: Approve
Revision history for this message
Daniel Manrique (roadmr) wrote :
Download full text (3.9 KiB)

The attempt to merge lp:~roadmr/checkbox-ihv-ng/update-piglit-ppa into lp:checkbox-ihv-ng failed. Below is the output from the failed tests.

[precise] Bringing VM 'up'
[precise] Unable to 'up' VM!
[precise] stdout: http://paste.ubuntu.com/6942683/
[precise] stderr: http://paste.ubuntu.com/6942684/
[precise] NOTE: unable to execute tests, marked as failed
[precise] Destroying failed VM to reclaim resources
[precise] Forcing shutdown of VM...
[precise] Destroying VM and associated drives...
[quantal] Bringing VM 'up'
[quantal] (timing) 8.20user 3.47system 5:30.20elapsed 3%CPU (0avgtext+0avgdata 21176maxresident)k
[quantal] (timing) 0inputs+224outputs (0major+194286minor)pagefaults 0swaps
[quantal] Starting tests...
[quantal] PlainBox GUI build: PASS
[quantal] (timing) 0.91user 0.28system 1:08.54elapsed 1%CPU (0avgtext+0avgdata 20556maxresident)k
[quantal] (timing) 1144inputs+56outputs (9major+47709minor)pagefaults 0swaps
[quantal] CheckBox test suite: PASS
[quantal] (timing) 1.02user 0.43system 0:42.14elapsed 3%CPU (0avgtext+0avgdata 19880maxresident)k
[quantal] (timing) 3576inputs+32outputs (38major+48891minor)pagefaults 0swaps
[quantal] (timing) 0.70user 0.32system 0:07.08elapsed 14%CPU (0avgtext+0avgdata 20824maxresident)k
[quantal] (timing) 504inputs+16outputs (18major+47675minor)pagefaults 0swaps
[quantal] PlainBox test suite: PASS
[quantal] (timing) 1.04user 0.28system 0:24.76elapsed 5%CPU (0avgtext+0avgdata 19888maxresident)k
[quantal] (timing) 0inputs+240outputs (0major+48012minor)pagefaults 0swaps
[quantal] PlainBox documentation build: PASS
[quantal] (timing) 0.77user 0.34system 0:26.65elapsed 4%CPU (0avgtext+0avgdata 19940maxresident)k
[quantal] (timing) 0inputs+16outputs (0major+47884minor)pagefaults 0swaps
[quantal] CheckBoxNG test suite: PASS
[quantal] (timing) 0.95user 0.35system 0:10.00elapsed 13%CPU (0avgtext+0avgdata 20780maxresident)k
[quantal] (timing) 2320inputs+16outputs (25major+47774minor)pagefaults 0swaps
[quantal] Integration tests: PASS
[quantal] (timing) 0.77user 0.28system 0:10.44elapsed 10%CPU (0avgtext+0avgdata 19924maxresident)k
[quantal] (timing) 0inputs+8outputs (0major+47947minor)pagefaults 0swaps
[quantal] Destroying VM
[raring] Bringing VM 'up'
[raring] (timing) 9.00user 3.94system 7:45.84elapsed 2%CPU (0avgtext+0avgdata 20884maxresident)k
[raring] (timing) 0inputs+248outputs (0major+218554minor)pagefaults 0swaps
[raring] Starting tests...
[raring] PlainBox GUI build: PASS
[raring] (timing) 0.82user 0.26system 1:08.18elapsed 1%CPU (0avgtext+0avgdata 20572maxresident)k
[raring] (timing) 0inputs+56outputs (0major+47821minor)pagefaults 0swaps
[raring] CheckBox test suite: PASS
[raring] (timing) 0.90user 0.32system 0:38.57elapsed 3%CPU (0avgtext+0avgdata 20660maxresident)k
[raring] (timing) 0inputs+32outputs (0major+47789minor)pagefaults 0swaps
[raring] (timing) 0.80user 0.28system 0:07.05elapsed 15%CPU (0avgtext+0avgdata 19712maxresident)k
[raring] (timing) 0inputs+16outputs (0major+47699minor)pagefaults 0swaps
[raring] PlainBox test suite: PASS
[raring] (timing) 1.01user 0.32system 0:1...

Read more...

Revision history for this message
Daniel Manrique (roadmr) wrote :

It's unable to install the qt ubuntu cordova plugin. This is not 100% necessary as we have proven with the ubuntu packaging branch.

I'll prepare another merge request to update testing of checkbox-ihv-ng (it's sadly outdated and is still testing old Ubuntu releases).

Revision history for this message
Daniel Manrique (roadmr) wrote :

Tarmac is unbroken now, so I'll reapprove this.

review: Approve

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