New upstream version 1.0.0+git20191223.292995b

13 files changed, 45 insertions, 1 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 16059d9..252c295 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -64,6 +64,7 @@ RUN apt-get update && \
         dosfstools \
         e2fsprogs \
         gzip \
+        pigz \
         libostree-1-1 \
         linux-image-amd64 \
         parted \
@@ -72,6 +73,7 @@ RUN apt-get update && \
         qemu-user-static \
         systemd \
         systemd-container \
+        unzip \
         xz-utils && \
     rm -rf /var/lib/apt/lists/*
 
diff --git a/docker/recipes.test.yml b/docker/recipes.test.yml
index 18d4aca..fde59b5 100644
--- a/docker/recipes.test.yml
+++ b/docker/recipes.test.yml
@@ -11,4 +11,4 @@ services:
             source: ./tests
             target: /recipes
         working_dir: /recipes
-        command: simple-recipe.yaml
+        entrypoint: ./tests.sh
diff --git a/docker/tests/base.tar.gz b/docker/tests/base.tar.gz
deleted file mode 100644
index cf787ff..0000000
--- a/docker/tests/base.tar.gz
+++ /dev/null
diff --git a/docker/tests/separatedirs/base.tar.gz b/docker/tests/separatedirs/base.tar.gz
new file mode 100644
index 0000000..0c8dc6d
--- /dev/null
+++ b/docker/tests/separatedirs/base.tar.gz
diff --git a/docker/tests/separatedirs/main.yaml b/docker/tests/separatedirs/main.yaml
new file mode 100644
index 0000000..f99d0e5
--- /dev/null
+++ b/docker/tests/separatedirs/main.yaml
@@ -0,0 +1,14 @@
+architecture: amd64
+
+actions:
+  - action: unpack
+    origin: recipe
+    compression: gz
+    file: base.tar.gz
+
+  - action: recipe
+    description: Load recipe from separate dir
+    recipe: ../subdirs/overlay-a/overlay-A.yaml
+
+  - action: run
+    command: find ${ROOTDIR}
diff --git a/docker/tests/A/A/A/A/a.txt b/docker/tests/simple/A/A/A/A/a.txt
index 7898192..7898192 100644
--- a/docker/tests/A/A/A/A/a.txt
+++ b/docker/tests/simple/A/A/A/A/a.txt
diff --git a/docker/tests/simple/base.tar.gz b/docker/tests/simple/base.tar.gz
new file mode 100644
index 0000000..0c8dc6d
--- /dev/null
+++ b/docker/tests/simple/base.tar.gz
diff --git a/docker/tests/simple-recipe.yaml b/docker/tests/simple/main.yaml
index b4f99f2..b4f99f2 100644
--- a/docker/tests/simple-recipe.yaml
+++ b/docker/tests/simple/main.yaml
diff --git a/docker/tests/subdirs/base.tar.gz b/docker/tests/subdirs/base.tar.gz
new file mode 100644
index 0000000..0c8dc6d
--- /dev/null
+++ b/docker/tests/subdirs/base.tar.gz
diff --git a/docker/tests/subdirs/main.yaml b/docker/tests/subdirs/main.yaml
new file mode 100644
index 0000000..abea663
--- /dev/null
+++ b/docker/tests/subdirs/main.yaml
@@ -0,0 +1,14 @@
+architecture: amd64
+
+actions:
+  - action: unpack
+    origin: recipe
+    compression: gz
+    file: base.tar.gz
+
+  - action: recipe
+    description: Load recipe from subdir
+    recipe: overlay-a/overlay-A.yaml
+
+  - action: run
+    command: find ${ROOTDIR}
diff --git a/docker/tests/subdirs/overlay-a/A/A/A/A/a.txt b/docker/tests/subdirs/overlay-a/A/A/A/A/a.txt
new file mode 100644
index 0000000..7898192
--- /dev/null
+++ b/docker/tests/subdirs/overlay-a/A/A/A/A/a.txt
@@ -0,0 +1 @@
+a
diff --git a/docker/tests/subdirs/overlay-a/overlay-A.yaml b/docker/tests/subdirs/overlay-a/overlay-A.yaml
new file mode 100644
index 0000000..f044176
--- /dev/null
+++ b/docker/tests/subdirs/overlay-a/overlay-A.yaml
@@ -0,0 +1,5 @@
+architecture: amd64
+
+actions:
+   - action: overlay
+     source: A
diff --git a/docker/tests/tests.sh b/docker/tests/tests.sh
new file mode 100755
index 0000000..9239d72
--- /dev/null
+++ b/docker/tests/tests.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+for dir in simple subdirs separatedirs ; do
+    pushd ${dir}
+    debos main.yaml
+    popd
+done