Merge lp:~canonical-platform-qa/ubuntu-system-tests/sleep-to-settle-system into lp:ubuntu-system-tests

Proposed by Allan LeSage
Status: Work in progress
Proposed branch: lp:~canonical-platform-qa/ubuntu-system-tests/sleep-to-settle-system
Merge into: lp:ubuntu-system-tests
Diff against target: 56 lines (+12/-8)
1 file modified
ubuntu_system_tests/command_line.py (+12/-8)
To merge this branch: bzr merge lp:~canonical-platform-qa/ubuntu-system-tests/sleep-to-settle-system
Reviewer Review Type Date Requested Status
platform-qa-bot continuous-integration Needs Fixing
PS Jenkins bot continuous-integration Approve
Canonical Platform QA Team Pending
Review via email: mp+288025@code.launchpad.net

Commit message

Sleep to let the image settle, fixes some Jenkins errors for arale.

Description of the change

So I've discovered that a lot of the issues I was chasing are due to flaky adb on arale only. This "sleep to settle" does help there, but it's not a guarantee. What do we think about this, are we willing to wait thirty seconds more when running our tests locally?

To post a comment you must log in.
346. By Allan LeSage

Adjust sleep time.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Needs Fixing (continuous-integration)

Unmerged revisions

346. By Allan LeSage

Adjust sleep time.

345. By Allan LeSage

Merge trunk.

344. By Allan LeSage

Extend sleep further.

343. By Allan LeSage

Extend sleeps and tries?

342. By Allan LeSage

Add sleep for system-settling before tests begin.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ubuntu_system_tests/command_line.py'
--- ubuntu_system_tests/command_line.py 2016-03-03 13:05:10 +0000
+++ ubuntu_system_tests/command_line.py 2016-03-03 21:30:38 +0000
@@ -426,6 +426,10 @@
426 else:426 else:
427 run_cmd.extend(_get_fs_ro_command())427 run_cmd.extend(_get_fs_ro_command())
428428
429 run_cmd.extend(
430 ['--setup-command',
431 'echo "Sleeping 30s to let system settle"; sleep 30'])
432
429 return run_cmd + ['---'] + ssh_cmd433 return run_cmd + ['---'] + ssh_cmd
430434
431435
@@ -437,15 +441,15 @@
437 # emulate pitti's convenience 'ro-apt-update' script, see441 # emulate pitti's convenience 'ro-apt-update' script, see
438 # http://anonscm.debian.org/cgit/autopkgtest/autopkgtest.git/commit/?id=a51f26f61c376 # NOQA442 # http://anonscm.debian.org/cgit/autopkgtest/autopkgtest.git/commit/?id=a51f26f61c376 # NOQA
439 'echo "Mounting rw to update"; RETRY=0; '443 'echo "Mounting rw to update"; RETRY=0; '
440 'until mount -o remount,rw / || [ $RETRY -gt 10 ]; do sleep 1; '444 'until mount -o remount,rw / || [ $RETRY -gt 20 ]; do sleep 1; '
441 'RETRY=$(($RETRY+1)); echo "mount attempt failed, trying '445 'RETRY=$(($RETRY+1)); echo "mount attempt failed, trying '
442 'again..."; done; if [ $RETRY -gt 10 ]; then exit 1; fi; '446 'again..."; done; if [ $RETRY -gt 20 ]; then exit 1; fi; '
443 'echo "apt-get updating"; apt-get update || '447 'echo "apt-get updating"; apt-get update || '
444 '(sleep 15; apt-get update); '448 '(sleep 15; apt-get update); '
445 'echo "Mounting ro after updating"; RETRY=0; '449 'echo "Mounting ro after updating"; RETRY=0; '
446 'until mount -o remount,ro / || [ $RETRY -gt 10 ]; do '450 'until mount -o remount,ro / || [ $RETRY -gt 20 ]; do '
447 'sleep 1; RETRY=$(($RETRY+1)); echo "mount attempt failed, '451 'sleep 1; RETRY=$(($RETRY+1)); echo "mount attempt failed, '
448 'trying again..."; done; if [ $RETRY -gt 10 ]; then exit 1; fi'452 'trying again..."; done; if [ $RETRY -gt 20 ]; then exit 1; fi'
449 ]453 ]
450 return []454 return []
451455
@@ -466,9 +470,9 @@
466 return [470 return [
467 '--setup-commands',471 '--setup-commands',
468 'echo "Mounting rw to install packages"; '472 'echo "Mounting rw to install packages"; '
469 'sync; RETRY=0; until mount -o remount,rw / || [ $RETRY -gt 10 ]; '473 'sync; RETRY=0; until mount -o remount,rw / || [ $RETRY -gt 20 ]; '
470 'do sleep 1; RETRY=$(($RETRY+1)); echo "mount attempt failed, trying '474 'do sleep 1; RETRY=$(($RETRY+1)); echo "mount attempt failed, trying '
471 'again..."; done; if [ $RETRY -gt 10 ]; then exit 1; fi'475 'again..."; done; if [ $RETRY -gt 20 ]; then exit 1; fi'
472 ]476 ]
473477
474478
@@ -476,9 +480,9 @@
476 return [480 return [
477 '--setup-commands',481 '--setup-commands',
478 'echo "Mounting ro after installing packages"; '482 'echo "Mounting ro after installing packages"; '
479 'sync; RETRY=0; until mount -o remount,ro / || [ $RETRY -gt 10 ]; '483 'sync; RETRY=0; until mount -o remount,ro / || [ $RETRY -gt 20 ]; '
480 'do sleep 1; RETRY=$(($RETRY+1)); echo "mount attempt failed, trying '484 'do sleep 1; RETRY=$(($RETRY+1)); echo "mount attempt failed, trying '
481 'again..."; done; if [ $RETRY -gt 10 ]; then exit 1; fi'485 'again..."; done; if [ $RETRY -gt 20 ]; then exit 1; fi'
482 ]486 ]
483487
484488

Subscribers

People subscribed via source and target branches

to all changes: