Merge lp://qastaging/~fgimenez/snappy/1504_validation into lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github

Proposed by Federico Gimenez
Status: Rejected
Rejected by: Federico Gimenez
Proposed branch: lp://qastaging/~fgimenez/snappy/1504_validation
Merge into: lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github
Prerequisite: lp://qastaging/~elopio/snappy/resize_test
Diff against target: 201 lines (+50/-43)
5 files modified
_integration-tests/tests/failover_zero_size_file_test.go (+22/-35)
_integration-tests/tests/installApp_test.go (+1/-1)
_integration-tests/tests/ubuntuFan_test.go (+8/-1)
_integration-tests/tests/update_test.go (+6/-1)
_integration-tests/testutils/common/common.go (+13/-5)
To merge this branch: bzr merge lp://qastaging/~fgimenez/snappy/1504_validation
Reviewer Review Type Date Requested Status
Snappy Developers Pending
Review via email: mp+271777@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2015-09-16.

Commit message

15.04 validation changes

Description of the change

15.04 validation changes, compatible with rolling too

To post a comment you must log in.
Revision history for this message
Leo Arias (elopio) wrote : Posted in a previous version of this proposal

I made these extra changes and could run successfully on 15.04 alpha #11.

http://paste.ubuntu.com/12432357/

Revision history for this message
Leo Arias (elopio) wrote : Posted in a previous version of this proposal

One more patch, to allow the execution on --update:
http://paste.ubuntu.com/12433452/

686. By Federico Gimenez

removed change to script in prerequesite

Revision history for this message
Leo Arias (elopio) wrote :

The prerequisite is proving harder than expected. So, we should merge the changes we can without that one.

Revision history for this message
Leo Arias (elopio) wrote :
Revision history for this message
Leo Arias (elopio) wrote :
Revision history for this message
Leo Arias (elopio) wrote :
Revision history for this message
Leo Arias (elopio) wrote :
Revision history for this message
Leo Arias (elopio) wrote :
Revision history for this message
Leo Arias (elopio) wrote :

Here's five https://code.launchpad.net/~elopio/snappy/fix_integration_cfg/+merge/272332

And I think we are done. The only remaining problem is the rollback.
The new kernel file branch needs some more stressing, because I think I saw it happening again at some point today. But I've touched too many branches, not sure about what I saw.

Revision history for this message
Federico Gimenez (fgimenez) wrote :

Thanks for bringing order to this mess :) I'll try the rollback now.

Unmerged revisions

686. By Federico Gimenez

removed change to script in prerequesite

685. By Federico Gimenez

merged trunk

684. By Federico Gimenez

no need for taking into account for old kernel files after the unified approach

683. By Federico Gimenez

Added patches from elopio

682. By Federico Gimenez

fixed try mode

681. By Federico Gimenez

more fixes

680. By Federico Gimenez

merged trunk

679. By Federico Gimenez

unified boot file paths for grub and uboot

678. By Federico Gimenez

merged resize_test2

677. By Federico Gimenez

merged elopio's resize_test

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