Merge lp:~canonical-platform-qa/qa-jenkins-jobs/use-ubuntu-system-tests-run into lp:qa-jenkins-jobs

Proposed by Richard Huddie
Status: Merged
Approved by: Allan LeSage
Approved revision: 45
Merged at revision: 46
Proposed branch: lp:~canonical-platform-qa/qa-jenkins-jobs/use-ubuntu-system-tests-run
Merge into: lp:qa-jenkins-jobs
Diff against target: 11 lines (+1/-1)
1 file modified
scripts/ubuntu-system-tests/run-ubuntu-system-tests.sh (+1/-1)
To merge this branch: bzr merge lp:~canonical-platform-qa/qa-jenkins-jobs/use-ubuntu-system-tests-run
Reviewer Review Type Date Requested Status
Allan LeSage (community) Approve
Review via email: mp+294620@code.launchpad.net

Commit message

Use ubuntu_system_tests.run command instead of command_line.

Description of the change

This change is required for when new packaging branch lands for ubuntu-system-tests: https://code.launchpad.net/~canonical-platform-qa/ubuntu-system-tests/add-new-packages/+merge/294378

To post a comment you must log in.
Revision history for this message
Max Brustkern (nuclearbob) wrote :

This looks good, but we should make sure not to land it until the new packaging branch lands. Jobs are automatically updated from qa-jenkins-jobs now.

Revision history for this message
Allan LeSage (allanlesage) wrote :

Approve conditional on turning both keys simultaneously.

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

I think we're better off in the future avoiding situations that require simultaneous key turning, but in this case that's probably a lot of effort for a small amount of payoff.

Revision history for this message
Allan LeSage (allanlesage) wrote :

Autodeploy is down so simultaneous key-turning situation unlikely to present itself :) .

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/ubuntu-system-tests/run-ubuntu-system-tests.sh'
2--- scripts/ubuntu-system-tests/run-ubuntu-system-tests.sh 2016-04-20 20:23:52 +0000
3+++ scripts/ubuntu-system-tests/run-ubuntu-system-tests.sh 2016-05-13 10:16:31 +0000
4@@ -20,7 +20,7 @@
5 bzr branch $UBUNTU_SYSTEM_TESTS_BRANCH ubuntu-system-tests
6 cd ubuntu-system-tests
7 python3 setup.py develop
8-python3 -m ubuntu_system_tests.command_line -n -d -p -u -v --config=$CONFIG_PATH "$TESTS"
9+python3 -m ubuntu_system_tests.run -n -d -p -u -v --config=$CONFIG_PATH "$TESTS"
10
11 deactivate # our virtualenv
12

Subscribers

People subscribed via source and target branches