4 files changed, 48 insertions, 3 deletions

diff --git a/lib/oeqa/selftest/garage_push.py b/lib/oeqa/selftest/garage_push.py
new file mode 100644
index 0000000..3490de5
--- /dev/null
+++ b/lib/oeqa/selftest/garage_push.py
@@ -0,0 +1,39 @@
+import unittest
+import os
+import logging
+
+from oeqa.selftest.base import oeSelfTest
+from oeqa.utils.commands import runCmd, bitbake, get_bb_var
+
+class GaragePushTests(oeSelfTest):
+
+    @classmethod
+    def setUpClass(cls):
+        # Ensure we have the right data in pkgdata
+        logger = logging.getLogger("selftest")
+        logger.info('Running bitbake to build aktualizr-native tools')
+        bitbake('aktualizr-native garage-sign-native')
+
+    def test_help(self):
+        image_dir = get_bb_var("D", "aktualizr-native")
+        bin_dir = get_bb_var("bindir", "aktualizr-native")
+        gp_path = os.path.join(image_dir, bin_dir[1:], 'garage-push')
+        result = runCmd('%s --help' % gp_path, ignore_status=True)
+        self.assertEqual(result.status, 0, "Status not equal to 0. output: %s" % result.output)
+
+    def test_java(self):
+        result = runCmd('which java', ignore_status=True)
+        self.assertEqual(result.status, 0, "Java not found.")
+
+    def test_sign(self):
+        image_dir = get_bb_var("D", "garage-sign-native")
+        bin_dir = get_bb_var("bindir", "garage-sign-native")
+        gs_path = os.path.join(image_dir, bin_dir[1:], 'garage-sign')
+        result = runCmd('%s --help' % gs_path, ignore_status=True)
+        self.assertEqual(result.status, 0, "Status not equal to 0. output: %s" % result.output)
+
+    def test_push(self):
+        bitbake('core-image-minimal')
+        self.write_config('IMAGE_INSTALL_append = " man "')
+        bitbake('core-image-minimal')
+
diff --git a/recipes-sota/garage-sign/garage-sign.bb b/recipes-sota/garage-sign/garage-sign.bb
index 3d8c98c..ccd7299 100644
--- a/recipes-sota/garage-sign/garage-sign.bb
+++ b/recipes-sota/garage-sign/garage-sign.bb
@@ -26,3 +26,9 @@ do_install() {
     install -m "0644" -t ${D}${libdir} ${S}/lib/*
 }
 
+FILES_${PN} = " \
+  /usr/bin \
+  /usr/bin/garage-sign.bat \
+  /usr/bin/garage-sign \
+  /usr/lib/* \
+  "
diff --git a/recipes-sota/ostree-initrd/files/init.sh b/recipes-sota/ostree-initrd/files/init.sh
index 0b0693d..d7e0429 100644
--- a/recipes-sota/ostree-initrd/files/init.sh
+++ b/recipes-sota/ostree-initrd/files/init.sh
@@ -67,7 +67,7 @@ ostree-prepare-root /sysroot
 
 # move mounted devices to new root
 cd /sysroot
-for x in dev proc; do
+for x in dev proc run; do
         log_info "Moving /$x to new rootfs"
         mount -o move "/$x" "$x"
 done
diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb
index 7a0320e..724976a 100644
--- a/recipes-sota/ostree/ostree_git.bb
+++ b/recipes-sota/ostree/ostree_git.bb
@@ -8,9 +8,9 @@ INHERIT_remove_class-native = "systemd"
 
 SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master"
 
-SRCREV="e3c3ec5dd91492e82c79223052443d038c60f41c"
+SRCREV="ae61321046ad7f4148a5884c8c6c8b2594ff840e"
 
-PV = "v2017.11-20-ge3c3ec5d"
+PV = "v2017.13"
 
 S = "${WORKDIR}/git"