Merge ~raharper/curtin:feature/use-unsquashfs into curtin:master

[Ryan Harper]

Use unsquashfs if specified

Unmerged commits

841d5fe... by Ryan Harper on 2019-11-06

vmtest: bump default nr_cpus to 2 for more unsquashfs performance!

91174a7... by Ryan Harper on 2019-11-04

wrap extracts in log_time

f907059... by Ryan Harper on 2019-11-04

Try unsquashfs first, vmtest change source to fsimage:PUBURL/squashfs

62f034a... by Ryan Harper on 2019-11-04

Use unsquashfs if fsimage is squashfs

diff --git a/curtin/commands/extract.py b/curtin/commands/extract.py
index 069023f..c160f56 100644
--- a/curtin/commands/extract.py
+++ b/curtin/commands/extract.py
@@ -50,11 +50,12 @@ def extract_root_tgz_url(url, target):
         return
 
     # Uses smtar to avoid specifying the compression type
-    util.subp(args=['sh', '-cf',
-                    ('wget "$1" --progress=dot:mega -O - |'
-                     'smtar -C "$2" ' + ' '.join(tar_xattr_opts()) +
-                     ' ' + '-Sxpf - --numeric-owner'),
-                    '--', url, target])
+    util.log_call(util.subp,
+        args=['sh', '-cf',
+              ('wget "$1" --progress=dot:mega -O - |'
+               'smtar -C "$2" ' + ' '.join(tar_xattr_opts()) +
+               ' ' + '-Sxpf - --numeric-owner'),
+               '--', url, target])
 
 
 def extract_root_fsimage_url(url, target):
@@ -72,6 +73,15 @@ def extract_root_fsimage_url(url, target):
 
 
 def _extract_root_fsimage(path, target):
+    try:
+        util.log_call(
+            util.subp, ["unsquashfs", "-f", "-d", target, path], capture=True)
+        LOG.info('Unsquashed rootfs successfully')
+        return
+    except util.ProcessExecutionError as e:
+        LOG.warning("Failed to unsquash '%s' for extraction: %s", path, e)
+
+    LOG.debug('Falling back to mounting fsimage for extraction')
     mp = tempfile.mkdtemp()
     try:
         util.subp(['mount', '-o', 'loop,ro', path, mp], capture=True)
diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
index 222adcc..7c063cc 100644
--- a/tests/vmtests/__init__.py
+++ b/tests/vmtests/__init__.py
@@ -819,7 +819,7 @@ class VMBaseClass(TestCase):
             logger.debug('Setting cpus from '
                          ' env["CURTIN_VMTEST_NR_CPUS"] value: %s', nr_cpus)
         if not nr_cpus:
-            nr_cpus = 1
+            nr_cpus = 2
             logger.debug('Setting cpus to default value: %s', nr_cpus)
 
         return str(nr_cpus)
@@ -1445,11 +1445,6 @@ class VMBaseClass(TestCase):
     @classmethod
     def get_install_source(cls, ftypes):
         """Return install uri and a list of files needed to be published."""
-        # if release (install environment) is the same as target
-        # target (thing to install) then install via cp://
-        if cls.target_release == cls.release:
-            install_src = "cp:///media/root-ro"
-            return install_src, []
 
         # publish the file to target/<ftype>
         # and set the install source to <type>:PUBURL/target/<ftype>