From bb19322149ce0a0e805010d0cddd149cf38e3c54 Mon Sep 17 00:00:00 2001
From: don <donkirkby@gmail.com>
Date: Tue, 31 Jul 2018 11:20:16 -0700
Subject: [PATCH] Remove singularity build as part of #737.

---
 kive/fleet/dockerlib.py       |  7 -------
 kive/fleet/tests_dockerlib.py |  3 +--
 kive/kive/settings_default.py |  2 +-
 vagrant/bootstrap.sh          | 14 ++++++++++++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/kive/fleet/dockerlib.py b/kive/fleet/dockerlib.py
index 9cf83989d..b56bed12e 100644
--- a/kive/fleet/dockerlib.py
+++ b/kive/fleet/dockerlib.py
@@ -379,13 +379,6 @@ def docker_is_alive(cls):
             if cls.singularity_cmd_path is None:
                 raise RuntimeError('Cannot determine singularity command path')
             logger.debug("singularity command path: '{}'".format(cls.singularity_cmd_path))
-            # docker repo
-            builddir = tempfile.mkdtemp()
-            test_image_name = os.path.join(builddir, "test.img")
-            build_command_str = cls._generate_build_string(DockerImage.DEFAULT_IMAGE,
-                                                           test_image_name)
-            out_str = cls._run_shell_command(build_command_str.split())
-            logger.debug("singularity build returned: '{}'".format(out_str))
             cls._is_alive = True
         return True
 
diff --git a/kive/fleet/tests_dockerlib.py b/kive/fleet/tests_dockerlib.py
index 70d847f49..60cb1bd6f 100755
--- a/kive/fleet/tests_dockerlib.py
+++ b/kive/fleet/tests_dockerlib.py
@@ -27,7 +27,6 @@ def setUp(self):
         self.docker_handler_class = self.get_docker_handler_class()
         is_docker_alive = self.docker_handler_class.docker_is_alive()
         self.assertTrue(is_docker_alive)
-        print('SEEETUP')
 
     def test_ident(self):
         """Test the docker_ident call"""
@@ -172,7 +171,7 @@ def test_gen_launch_cmd01(self):
                 assert isinstance(retlst, list), 'expected a list'
                 for s in retlst:
                     assert isinstance(s, six.string_types), 'expected a string'
-                lverb = True
+                lverb = False
                 if lverb:
                     print("got launch {}".format(retlst))
             except NotImplementedError:
diff --git a/kive/kive/settings_default.py b/kive/kive/settings_default.py
index 31bf1f17c..27d17b69e 100644
--- a/kive/kive/settings_default.py
+++ b/kive/kive/settings_default.py
@@ -393,4 +393,4 @@
 
 # Attempt to run the system tests that use singularity
 # NOTE: It only makes sense to have this true iff RUN_DOCKER_TESTS is also true
-RUN_SINGULARITY_TESTS = False
+RUN_SINGULARITY_TESTS = RUN_DOCKER_TESTS and False
diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh
index 809e071e3..9089a278f 100644
--- a/vagrant/bootstrap.sh
+++ b/vagrant/bootstrap.sh
@@ -1,13 +1,23 @@
 #!/usr/bin/env bash
 
-yum install -y git libtool libarchive-devel squashfs-tools
+yum install -y git libtool libarchive-devel squashfs-tools python-devel sqlite-devel
 
+# Singularity
 git clone https://github.com/singularityware/singularity.git
 cd singularity
-git checkout tags/2.5.2
+git checkout -q tags/2.5.2
 ./autogen.sh
 ./configure --prefix=/usr/local
 make
 sudo make install
 cd ..
 rm -rf singularity
+
+# pip
+curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+python get-pip.py pip==9.0.1
+rm get-pip.py
+
+# Kive
+cd /usr/local/share/Kive
+pip install -r requirements-dev.txt