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

[Allan LeSage]

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

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?

[lp:~canonical-platform-qa/ubuntu-system-tests/sleep-to-settle-system]

346. By Allan LeSage on 2016-03-03

Adjust sleep time.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:346
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1424/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/1151
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/1153
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/1150

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

review: Approve (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:346
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/4/
Executed test runs:
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/26/console
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/27/console
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/31/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/4/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

346. By Allan LeSage on 2016-03-03

Adjust sleep time.

345. By Allan LeSage on 2016-03-03

Merge trunk.

344. By Allan LeSage on 2016-02-24

Extend sleep further.

343. By Allan LeSage on 2016-02-24

Extend sleeps and tries?

342. By Allan LeSage on 2016-02-24

Add sleep for system-settling before tests begin.

=== 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 @@
     else:
         run_cmd.extend(_get_fs_ro_command())
 
+    run_cmd.extend(
+        ['--setup-command',
+         'echo "Sleeping 30s to let system settle"; sleep 30'])
+
     return run_cmd + ['---'] + ssh_cmd
 
 
@@ -437,15 +441,15 @@
             # emulate pitti's convenience 'ro-apt-update' script, see
             # http://anonscm.debian.org/cgit/autopkgtest/autopkgtest.git/commit/?id=a51f26f61c376  # NOQA
             'echo "Mounting rw to update"; RETRY=0; '
-            'until mount -o remount,rw / || [ $RETRY -gt 10 ]; do sleep 1; '
+            'until mount -o remount,rw / || [ $RETRY -gt 20 ]; do sleep 1; '
             'RETRY=$(($RETRY+1)); echo "mount attempt failed, trying '
-            'again..."; done; if [ $RETRY -gt 10 ]; then exit 1; fi; '
+            'again..."; done; if [ $RETRY -gt 20 ]; then exit 1; fi; '
             'echo "apt-get updating"; apt-get update || '
             '(sleep 15; apt-get update); '
             'echo "Mounting ro after updating"; RETRY=0; '
-            'until mount -o remount,ro / || [ $RETRY -gt 10 ]; do '
+            'until mount -o remount,ro / || [ $RETRY -gt 20 ]; do '
             'sleep 1; RETRY=$(($RETRY+1)); echo "mount attempt failed, '
-            'trying again..."; done; if [ $RETRY -gt 10 ]; then exit 1; fi'
+            'trying again..."; done; if [ $RETRY -gt 20 ]; then exit 1; fi'
         ]
     return []
 
@@ -466,9 +470,9 @@
     return [
         '--setup-commands',
         'echo "Mounting rw to install packages"; '
-        'sync; RETRY=0; until mount -o remount,rw / || [ $RETRY -gt 10 ]; '
+        'sync; RETRY=0; until mount -o remount,rw / || [ $RETRY -gt 20 ]; '
         'do sleep 1; RETRY=$(($RETRY+1)); echo "mount attempt failed, trying '
-        'again..."; done; if [ $RETRY -gt 10 ]; then exit 1; fi'
+        'again..."; done; if [ $RETRY -gt 20 ]; then exit 1; fi'
     ]
 
 
@@ -476,9 +480,9 @@
     return [
         '--setup-commands',
         'echo "Mounting ro after installing packages"; '
-        'sync; RETRY=0; until mount -o remount,ro / || [ $RETRY -gt 10 ]; '
+        'sync; RETRY=0; until mount -o remount,ro / || [ $RETRY -gt 20 ]; '
         'do sleep 1; RETRY=$(($RETRY+1)); echo "mount attempt failed, trying '
-        'again..."; done; if [ $RETRY -gt 10 ]; then exit 1; fi'
+        'again..."; done; if [ $RETRY -gt 20 ]; then exit 1; fi'
     ]