diff options
| author | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2020-01-16 15:25:17 +0100 |
|---|---|---|
| committer | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2020-01-16 15:25:17 +0100 |
| commit | abc4a2e11c94fd948c684d678701cc90bc7a7ab6 (patch) | |
| tree | e36dcbc5e5cf210700d52cfc8bdabc9a094ee50e /docker/tests | |
| parent | 84c12c16ed094874a058bac6aaf70dfa25ace1d6 (diff) | |
| parent | fef5746ee329eb560d740132895ed29a44e44d10 (diff) | |
Update upstream source from tag 'upstream/1.0.0+git20191223.292995b'
Update to upstream version '1.0.0+git20191223.292995b'
with Debian dir f7f3a5ade924e6cb45402aac0b363e5f82aa5ae4
Diffstat (limited to 'docker/tests')
| -rw-r--r-- | docker/tests/base.tar.gz | bin | 289 -> 0 bytes | |||
| -rw-r--r-- | docker/tests/separatedirs/base.tar.gz | bin | 0 -> 631 bytes | |||
| -rw-r--r-- | docker/tests/separatedirs/main.yaml | 14 | ||||
| -rw-r--r-- | docker/tests/simple/A/A/A/A/a.txt (renamed from docker/tests/A/A/A/A/a.txt) | 0 | ||||
| -rw-r--r-- | docker/tests/simple/base.tar.gz | bin | 0 -> 631 bytes | |||
| -rw-r--r-- | docker/tests/simple/main.yaml (renamed from docker/tests/simple-recipe.yaml) | 0 | ||||
| -rw-r--r-- | docker/tests/subdirs/base.tar.gz | bin | 0 -> 631 bytes | |||
| -rw-r--r-- | docker/tests/subdirs/main.yaml | 14 | ||||
| -rw-r--r-- | docker/tests/subdirs/overlay-a/A/A/A/A/a.txt | 1 | ||||
| -rw-r--r-- | docker/tests/subdirs/overlay-a/overlay-A.yaml | 5 | ||||
| -rwxr-xr-x | docker/tests/tests.sh | 8 |
11 files changed, 42 insertions, 0 deletions
diff --git a/docker/tests/base.tar.gz b/docker/tests/base.tar.gz Binary files differdeleted 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 |