Ubuntu Test Cases

Merge lp:~pwlars/ubuntu-test-cases/bootest-no-revision into lp:~canonical-ci-engineering/ubuntu-test-cases/boottest

  1. bootest-no-revision
  2. Merge into boottest
Proposed by Paul Larson
Status: Merged
Merged at revision: 403
Proposed branch: lp:~pwlars/ubuntu-test-cases/bootest-no-revision
Merge into: lp:~canonical-ci-engineering/ubuntu-test-cases/boottest
Diff against target: 15 lines (+2/-3)
1 file modified
scripts/boottest.sh (+2/-3)
To merge this branch: bzr merge lp:~pwlars/ubuntu-test-cases/bootest-no-revision
Reviewer Review Type Date Requested Status
Vincent Ladeuil (community) Approve
Paul Larson Needs Resubmitting
Francis Ginther Needs Fixing
Review via email: mp+248703@code.launchpad.net

Description of the change

This workaround is no longer needed

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

We need to keep the ability to override the default revision and override with something specific. This would be necessary if the latest image is unbootable and we roll back to the prior revision to keep proposed-migration testing moving. But setting this to '81' is also not the desired behavior, we should use '0' to default to the latest revision.

This revision override is one of the motivations for the boottestrc file. Perhaps there is a better way to achieve this overall goal.

review: Needs Fixing
Revision history for this message
Francis Ginther (fginther) wrote :

And thanks for catching this, this was clearly wrong :-).

Revision history for this message
Francis Ginther (fginther) wrote :

Err, at least not the best way to do things. Thank you immutable comments.

Revision history for this message
Vincent Ladeuil (vila) wrote :

Agreed with Francis.

Revision history for this message
Paul Larson (pwlars) wrote :

Good point, it now defaults to 0 instead of 81.

review: Needs Resubmitting
Revision history for this message
Francis Ginther (fginther) wrote :

Approved.

review: Approve
Revision history for this message
Francis Ginther (fginther) wrote :

Bad review on my part. I think you meant '-' and not ':'.

review: Needs Fixing
Revision history for this message
Francis Ginther (fginther) wrote :

Forget inline comment.

review: Needs Fixing
Revision history for this message
Vincent Ladeuil (vila) wrote :

Shouldn't that be both, i.e. :- ?

Revision history for this message
Paul Larson (pwlars) wrote :

*sigh* yeah, either would work. Typo fixed.
Good catch

review: Needs Resubmitting
lp:~pwlars/ubuntu-test-cases/bootest-no-revision updated
403. By Paul Larson

typo

Revision history for this message
Vincent Ladeuil (vila) wrote :

Yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/boottest.sh'
2--- scripts/boottest.sh 2015-01-30 13:57:17 +0000
3+++ scripts/boottest.sh 2015-02-06 15:40:22 +0000
4@@ -54,9 +54,8 @@
5 TESTS=${BASEDIR}/tests
6
7 # Provision the device
8-# FIXME: workaround #82 being unbootable for krillin assuming we run on
9-# dev-jenkins until this is fixed -- vila 2015-01-23
10-REVISION="${REVISION:-81}"
11+# Allow the image revision to be overridden if the latest is unusable
12+REVISION="${REVISION:-0}"
13 PROV_CMD="${BASEDIR}/scripts/provision.sh \
14 -r $REVISION \
15 -n ${HOME}/.ubuntu-ci/wifi.conf -w"

Subscribers

People subscribed via source and target branches