Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/nbd-smk-setup into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

Create a pseudo setup test to split the package installation stage out.
It'll make it easier for us to know which part of the test is failing.

[Po-Hsu Lin (cypressyew)]

Self-approving.

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed.

diff --git a/ubuntu_nbd_smoke_test/control b/ubuntu_nbd_smoke_test/control
index 1b5937a..b22997b 100644
--- a/ubuntu_nbd_smoke_test/control
+++ b/ubuntu_nbd_smoke_test/control
@@ -10,8 +10,10 @@ TEST_CATEGORY = 'Functional'
 TEST_TYPE = "client"
 DOC = ""
 
-name = 'ubuntu_nbd_smoke_test'
-
-results = job.run_test_detail('ubuntu_nbd_smoke_test', test_name='nbd-smoke-test', tag='nbd-smoke-test', timeout=900) # 15 min. timeout
+result = job.run_test_detail(NAME, test_name='setup', tag='setup', timeout=60*30)
+if result == 'GOOD':
+    results = job.run_test_detail(NAME, test_name='nbd-smoke-test', tag='nbd-smoke-test', timeout=900) # 15 min. timeout
+else:
+    print("ERROR: test failed to build, skipping all the sub tests")
 
 # vi:set ts=4 sw=4 expandtab syntax=python:
diff --git a/ubuntu_nbd_smoke_test/ubuntu_nbd_smoke_test.py b/ubuntu_nbd_smoke_test/ubuntu_nbd_smoke_test.py
index b3972dc..5718a3a 100644
--- a/ubuntu_nbd_smoke_test/ubuntu_nbd_smoke_test.py
+++ b/ubuntu_nbd_smoke_test/ubuntu_nbd_smoke_test.py
@@ -52,6 +52,9 @@ class ubuntu_nbd_smoke_test(test.test):
         #
         #  stress-ng "quick fire" short life tests
         #
+        if test_name == 'setup':
+            return
+
         cmd = self.bindir + '/ubuntu_nbd_smoke_test.sh'
         self.results = utils.system_output(cmd, retain_output=True)
         #