tweaks to build

Author: vsoch

singularity/analysis/reproduce/hash.py

@@ -28,9 +28,9 @@
 
 from singularity.cli import Singularity
 from singularity.logger import bot
-from .criteria import *
-from .levels import *
-from .utils import (
+from singularity.analysis.reproduce.criteria import *
+from singularity.analysis.reproduce.levels import *
+from singularity.analysis.reproduce.utils import (
     get_image_tar,
     delete_image_tar,
     extract_guts
@@ -130,7 +130,8 @@ def get_image_hash(image_path,
 def get_content_hashes(image_path,
                        level=None,
                        regexp=None,
-                       include_files=None,tag_root=True,
+                       include_files=None,
+                       tag_root=True,
                        level_filter=None,
                        skip_files=None,
                        version=None,

singularity/analysis/reproduce/metrics.py

@@ -37,7 +37,8 @@
 def assess_differences(image_file1,
                        image_file2,
                        levels=None,
-                       version=None,size_heuristic=False,
+                       version=None,
+                       size_heuristic=False,
                        guts1=None,
                        guts2=None):
 
@@ -62,15 +63,13 @@ def assess_differences(image_file1,
         # Compare the dictionary of file:hash between two images, and get root owned lookup
         if guts1 is None:
             guts1 = get_content_hashes(image_path=image_file1,
-                                       level_filter=level_filter,
-                                       tag_root=True,
-                                       include_sizes=True)
+                                       level_filter=level_filter)
+                                       # tag_root=True
+                                       # include_sizes=True
 
         if guts2 is None:
             guts2 = get_content_hashes(image_path=image_file2,
-                                       level_filter=level_filter,
-                                       tag_root=True,
-                                       include_sizes=True)
+                                       level_filter=level_filter)
 
         files = list(set(list(guts1['hashes'].keys()) + list(guts2['hashes'].keys())))
 

singularity/cli/__init__.py

@@ -304,7 +304,7 @@ def pull(self,image_path,pull_folder='',
             elif name_by_hash is True:
                 bot.debug("user specified naming by hash.")
                 cmd.append("--hash")
-            else:
+            else: # otherwise let the Singularity client determine own name
                 image_name = "%s" %image_path.replace("shub://","").replace("/","-") 
 
         elif image_path.startswith('docker://'):
@@ -315,11 +315,10 @@ def pull(self,image_path,pull_folder='',
             cmd = cmd + ["--name", image_name]
 
         cmd.append(image_path)
-        image_path = "%s/%s.img" %(pull_folder,image_name)  
         bot.debug(' '.join(cmd))
         output = self.run_command(cmd)
         self.println(output)
-        return image_path
+        return output.split('Container is at:')[-1].strip('\n')
 
 
     def run(self,image_path,args=None,writable=False,contain=False):

singularity/tests/data/README

@@ -0,0 +1,9 @@
+# Generation
+
+The cirros and busybox images were produced with Singularity 2.4, which has a much smaller image footprint. The file extractions for the package are from 2016, and were remade as one had become corrupt. More evidence for squashfs
+
+```
+sudo singularity build cirros-2017-10-21.simg docker://cirros
+sudo singularity build busybox-2017-10-21.simg docker://busybox
+
+```

singularity/tests/data/busybox-2016-02-16.img

@@ -56,9 +56,8 @@ def setUp(self):
         self.pwd = get_installdir()
         self.cli = Singularity()
         self.tmpdir = tempfile.mkdtemp()
-        self.image1 = "%s/tests/data/busybox-2016-02-16.img" %(self.pwd)
-        self.image2 = "%s/tests/data/cirros-2016-01-04.img" %(self.pwd)
-        # We can't test creating the packages, because requires sudo :/
+        self.image1 = "%s/tests/data/busybox-2017-10-21.simg" %(self.pwd)
+        self.image2 = "%s/tests/data/cirros-2017-10-21.simg" %(self.pwd)
         self.pkg1 = "%s/tests/data/busybox-2016-02-16.img.zip" %(self.pwd)
         self.pkg2 = "%s/tests/data/cirros-2016-01-04.img.zip" %(self.pwd)
 

singularity/tests/data/busybox-2017-10-21.simg

@@ -55,8 +55,8 @@ def setUp(self):
         self.pwd = get_installdir()
         self.cli = Singularity()
         self.tmpdir = tempfile.mkdtemp()
-        self.image1 = "%s/tests/data/busybox-2016-02-16.img" %(self.pwd)
-        self.image2 = "%s/tests/data/cirros-2016-01-04.img" %(self.pwd)
+        self.image1 = "%s/tests/data/busybox-2017-10-21.simg" %(self.pwd)
+        self.image2 = "%s/tests/data/cirros-2017-10-21.simg" %(self.pwd)
 
     def tearDown(self):
         shutil.rmtree(self.tmpdir)