From d9da19a29bb749e5dcfd33bceb6d504bffafb057 Mon Sep 17 00:00:00 2001
From: Lubomír Sedlář <lsedlar@redhat.com>
Date: Apr 12 2016 16:10:48 +0000
Subject: [ostree-installer] Install ostree in runroot


Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>

---

diff --git a/pungi/phases/ostree_installer.py b/pungi/phases/ostree_installer.py
index 7399874..934c304 100644
--- a/pungi/phases/ostree_installer.py
+++ b/pungi/phases/ostree_installer.py
@@ -149,7 +149,7 @@ class OstreeInstallerThread(WorkerThread):
         runroot_channel = compose.conf.get("runroot_channel", None)
         runroot_tag = compose.conf["runroot_tag"]
 
-        packages = ['pungi', 'lorax']
+        packages = ['pungi', 'lorax', 'ostree']
         log_file = os.path.join(self.logdir, 'runroot.log')
         koji = kojiwrapper.KojiWrapper(compose.conf["koji_profile"])
         koji_cmd = koji.get_runroot_cmd(runroot_tag, arch, cmd,
diff --git a/tests/test_ostree_installer_phase.py b/tests/test_ostree_installer_phase.py
index 7007a3f..34489a7 100644
--- a/tests/test_ostree_installer_phase.py
+++ b/tests/test_ostree_installer_phase.py
@@ -146,7 +146,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
                                      '--nomacboot',
                                      self.topdir + '/work/x86_64/Everything/ostree_installer'],
                                     channel=None, mounts=[self.topdir],
-                                    packages=['pungi', 'lorax'],
+                                    packages=['pungi', 'lorax', 'ostree'],
                                     task_id=True, use_shell=True)])
         self.assertEqual(koji.run_runroot_cmd.call_args_list,
                          [mock.call(koji.get_runroot_cmd.return_value,
@@ -263,7 +263,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
                                      '--add-arch-template={}/other_file.txt'.format(templ_dir),
                                      self.topdir + '/work/x86_64/Everything/ostree_installer'],
                                     channel=None, mounts=[self.topdir],
-                                    packages=['pungi', 'lorax'],
+                                    packages=['pungi', 'lorax', 'ostree'],
                                     task_id=True, use_shell=True)])
         self.assertEqual(koji.run_runroot_cmd.call_args_list,
                          [mock.call(koji.get_runroot_cmd.return_value,
@@ -347,7 +347,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
                         '--add-arch-template-var=ostree_ref=fedora-atomic/Rawhide/x86_64/docker-host',
                         self.topdir + '/work/x86_64/Everything/ostree_installer'],
                        channel=None, mounts=[self.topdir],
-                       packages=['pungi', 'lorax'],
+                       packages=['pungi', 'lorax', 'ostree'],
                        task_id=True, use_shell=True)])
         self.assertEqual(koji.run_runroot_cmd.call_args_list,
                          [mock.call(koji.get_runroot_cmd.return_value,