Merge lp://qastaging/~mvo/snappy/snappy-review-tools-reenable into lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github

Proposed by Michael Vogt
Status: Approved
Approved by: Leo Arias
Approved revision: 575
Proposed branch: lp://qastaging/~mvo/snappy/snappy-review-tools-reenable
Merge into: lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 66 lines (+15/-11)
2 files modified
_integration-tests/testutils/build/snap.go (+8/-2)
cmd/snappy/cmd_build.go (+7/-9)
To merge this branch: bzr merge lp://qastaging/~mvo/snappy/snappy-review-tools-reenable
Reviewer Review Type Date Requested Status
Leo Arias (community) Approve
Federico Gimenez (community) continuous-integration Needs Fixing
John Lenton (community) Approve
Snappy Tarmac continuous-integration Pending
Review via email: mp+264301@code.qastaging.launchpad.net

Description of the change

Once the tools are updated from the latest upload in tools-proposed this MP can land as the click-review-tools are now working very well with snaps.

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) wrote :

Yes please. Top approve if/when the tools are ready.

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

FAILED: Continuous integration, rev:573
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mvo/snappy/snappy-review-tools-reenable/+merge/264301/+edit-commit-message

http://10.55.60.183:8080/job/snappy-rolling-ci/26/
Executed test runs:

Click here to trigger a rebuild:
http://10.55.60.183:8080/job/snappy-rolling-ci/26/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Leo Arias (elopio) wrote :

We have an integration test that builds a snap: http://bazaar.launchpad.net/~snappy-dev/snappy/snappy/view/head:/_integration-tests/tests/build_test.go#L49
The build is done in the snappy machine, and it is not expecting the warning we get when click-review is not installed. So, the test needs to be updated to match a more relaxed rexexp. And we need a new card to test more builds including the review, but that should probably wait until comfy is properly defined.

START: /tmp/snappy-tests-job/24707/src/launchpad.net/snappy/_integration-tests/tests/build_test.go:49: buildSuite.TestBuildBasicSnapOnSnappy
START: <autogenerated>:7: buildSuite.SetUpTest
****** Running buildSuite.TestBuildBasicSnapOnSnappy
[...]

snappy build _integration-tests/data/snaps/basic
Warning: could not review package (click-review not available)
Generated 'basic_1.0_all.snap' snap
/tmp/snappy-tests-job/24707/src/launchpad.net/snappy/_integration-tests/tests/build_test.go:55:
    ...open /tmp/snappy-tests-job/24707/src/launchpad.net/snappy/_integration-tests/tests/build_test.go: no such file or directory
... obtained string = "" +
... "Warning: could not review package (click-review not available)\n" +
... "Generated 'basic_1.0_all.snap' snap\n"
... expected string = "Generated 'basic_1.0_all.snap' snap\n"

review: Needs Fixing
Revision history for this message
Michael Vogt (mvo) wrote :

This branch was somehow forgotten. We should resurrect it :) What needs to happen for the test? Can we just install click-reviewers-tools from the tools PPA?

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

After merging with trunk, something like this makes the test pass.

http://paste.ubuntu.com/12705348/

We can't install the reviewer tools because we are doing the build on snappy itself. Well, we could install them, but not with apt-get.
Now that your classic dimension snappy is coming, we can move the build to that environment, and test more things. For now, this will do.

574. By Michael Vogt

merged lp:snappy

575. By Michael Vogt

apply patch from Leo to fix integration tests

Revision history for this message
Michael Vogt (mvo) wrote :

Thanks Leo! I updated the branch and applied your patch. Hopefully its ready now.

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

:D

review: Approve

Unmerged revisions

575. By Michael Vogt

apply patch from Leo to fix integration tests

574. By Michael Vogt

merged lp:snappy

573. By Michael Vogt

re-enable the review tools

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