ubuntu-power-tests

Merge lp://staging/~nuclearbob/ubuntu-power-tests/no-wifi-in-test-upload into lp://staging/ubuntu-power-tests

  1. no-wifi-in-test-upload
  2. Merge into trunk
Proposed by Max Brustkern
Status: Merged
Merged at revision: 9
Proposed branch: lp://staging/~nuclearbob/ubuntu-power-tests/no-wifi-in-test-upload
Merge into: lp://staging/ubuntu-power-tests
Diff against target: 365 lines (+159/-47)
7 files modified
README (+8/-2)
debian/tests/tc-powermeter-03 (+97/-14)
debian/tests/tc-powermeter-05 (+12/-4)
power-meter-tests/logdata.sh (+1/-1)
power-meter-tests/statparse.py (+20/-6)
power-meter-tests/test.sh (+12/-7)
power-meter-tests/test_upload.sh (+9/-13)
To merge this branch: bzr merge lp://staging/~nuclearbob/ubuntu-power-tests/no-wifi-in-test-upload
Reviewer Review Type Date Requested Status
Brendan Donegan (community) Approve
PS Jenkins bot continuous-integration Approve
Federico Gimenez (community) Approve
Review via email: mp+257213@code.staging.launchpad.net

Commit message

Update the power tests to run in jenkins

Description of the change

This branch includes all the changes I needed to make to get tests running in Jenkins. I have not completed a full test run yet, so additional changes may be needed. I'd like to get reviews on what I have so far. If we want to go ahead and land it before I get on tomorrow, I can propose additional changes in another branch. Everything here does work as expected on my system.

To post a comment you must log in.
lp://staging/~nuclearbob/ubuntu-power-tests/no-wifi-in-test-upload updated
16. By Max Brustkern

Removed extraneous root

17. By Max Brustkern

Removed nonworking gps enablment

18. By Max Brustkern

Removed needless sudos

Revision history for this message
Max Brustkern (nuclearbob) wrote :

This is the version I've had success with running as a jenkins job. I'd like to land these changes and then we can work on further improvements.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:18
http://jenkins.qa.ubuntu.com/job/ubuntu-power-tests-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-power-tests-vivid-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-power-tests-vivid-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-power-tests-vivid-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-power-tests-ci/6/rebuild

review: Approve (continuous-integration)
lp://staging/~nuclearbob/ubuntu-power-tests/no-wifi-in-test-upload updated
19. By Max Brustkern

Added Federico's oauth2 code with some mods to support the GoogleCredentials object

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:19
http://jenkins.qa.ubuntu.com/job/ubuntu-power-tests-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-power-tests-vivid-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-power-tests-vivid-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-power-tests-vivid-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-power-tests-ci/7/rebuild

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

Kudos to you Max! Great work, I've added a minor comment about the ouath2 thing for better documentation.

Thanks,

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

We could also add a comment with a link to google's documentation on how to get the json secrets file [1] and maybe also making clear that you need to share (with edit permission) the spreadsheet to the client_email in that json file.

Cheers!

[1] https://developers.google.com/identity/protocols/OAuth2ServiceAccount

lp://staging/~nuclearbob/ubuntu-power-tests/no-wifi-in-test-upload updated
20. By Max Brustkern

Testing changes to powermeter-05

21. By Max Brustkern

Removed bashisms

22. By Max Brustkern

Using sh-compatible trap

23. By Max Brustkern

Updated spreadsheet info per fgimenez's comments

24. By Max Brustkern

Updated tc-powermeter-03 to use the new changes from 5

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:24
http://jenkins.qa.ubuntu.com/job/ubuntu-power-tests-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-power-tests-vivid-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-power-tests-vivid-armhf-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-power-tests-vivid-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-power-tests-ci/9/rebuild

review: Approve (continuous-integration)
Revision history for this message
Max Brustkern (nuclearbob) wrote :

I got tc-powermeter-03 and -05 working with Richard's changes, and added some things to address comments from Federico. Can I get a final review?

Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Do we still need espeak or is that there for backwards compatibility so to speak?

review: Needs Information
Revision history for this message
Max Brustkern (nuclearbob) wrote :

It could be useful for a setup with a meter but without a relay, like what
Selene has now. Perhaps the dependency on espeak should be removed since
it's not installed by default. I also wonder if we should have a copy of
ncd_usb.py in this package, or otherwise specify it needs to be around.

Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Answers my question. Thanks

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