diff options
Diffstat (limited to 'recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch')
-rw-r--r-- | recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch b/recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch deleted file mode 100644 index f335e796..00000000 --- a/recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch +++ /dev/null | |||
@@ -1,85 +0,0 @@ | |||
1 | From 1c2506434e744d8c6a86e42c9d8bae4cde7553f6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | ||
3 | Date: Thu, 31 May 2018 15:14:26 -0400 | ||
4 | Subject: [PATCH] tests: add '--no-validate' when using download template | ||
5 | |||
6 | We are usually running the ptests with core-image-minimal which has no | ||
7 | mechanism to validate the downloads. Validation isn't really of | ||
8 | interest to this test at any rate so simply add '--no-validate' to | ||
9 | avoid failing due to no GPG validation. | ||
10 | |||
11 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | ||
12 | |||
13 | --- | ||
14 | src/tests/lxc-test-apparmor-mount | 2 +- | ||
15 | src/tests/lxc-test-autostart | 2 +- | ||
16 | src/tests/lxc-test-no-new-privs | 2 +- | ||
17 | src/tests/lxc-test-unpriv | 2 +- | ||
18 | src/tests/lxc-test-usernic.in | 2 +- | ||
19 | 5 files changed, 5 insertions(+), 5 deletions(-) | ||
20 | |||
21 | Index: lxc-4.0.9/src/tests/lxc-test-apparmor-mount | ||
22 | =================================================================== | ||
23 | --- lxc-4.0.9.orig/src/tests/lxc-test-apparmor-mount | ||
24 | +++ lxc-4.0.9/src/tests/lxc-test-apparmor-mount | ||
25 | @@ -170,7 +170,7 @@ | ||
26 | done | ||
27 | fi | ||
28 | |||
29 | -run_cmd lxc-create -t download -n $cname -- -d ubuntu -r $release -a $ARCH | ||
30 | +run_cmd lxc-create -t download -n $cname -- --no-validate -d ubuntu -r $release -a $ARCH | ||
31 | |||
32 | echo "test default confined container" | ||
33 | run_cmd lxc-start -n $cname -d -lDEBUG -o "$logfile" | ||
34 | Index: lxc-4.0.9/src/tests/lxc-test-autostart | ||
35 | =================================================================== | ||
36 | --- lxc-4.0.9.orig/src/tests/lxc-test-autostart | ||
37 | +++ lxc-4.0.9/src/tests/lxc-test-autostart | ||
38 | @@ -55,7 +55,7 @@ | ||
39 | done | ||
40 | fi | ||
41 | |||
42 | -lxc-create -t download -n $CONTAINER_NAME -B dir -- -d ubuntu -r $release -a $ARCH | ||
43 | +lxc-create -t download -n $CONTAINER_NAME -B dir -- --no-validate -d ubuntu -r $release -a $ARCH | ||
44 | CONTAINER_PATH=$(dirname $(lxc-info -n $CONTAINER_NAME -c lxc.rootfs.path -H) | sed -e 's/dir://') | ||
45 | cp $CONTAINER_PATH/config $CONTAINER_PATH/config.bak | ||
46 | |||
47 | Index: lxc-4.0.9/src/tests/lxc-test-no-new-privs | ||
48 | =================================================================== | ||
49 | --- lxc-4.0.9.orig/src/tests/lxc-test-no-new-privs | ||
50 | +++ lxc-4.0.9/src/tests/lxc-test-no-new-privs | ||
51 | @@ -49,7 +49,7 @@ | ||
52 | ARCH=$(dpkg --print-architecture) | ||
53 | fi | ||
54 | |||
55 | -lxc-create -t download -n c1 -- -d ubuntu -r xenial -a $ARCH | ||
56 | +lxc-create -t download -n c1 -- --no-validate -d ubuntu -r xenial -a $ARCH | ||
57 | echo "lxc.no_new_privs = 1" >> /var/lib/lxc/c1/config | ||
58 | |||
59 | lxc-start -n c1 | ||
60 | Index: lxc-4.0.9/src/tests/lxc-test-unpriv | ||
61 | =================================================================== | ||
62 | --- lxc-4.0.9.orig/src/tests/lxc-test-unpriv | ||
63 | +++ lxc-4.0.9/src/tests/lxc-test-unpriv | ||
64 | @@ -178,7 +178,7 @@ | ||
65 | cp -R /var/cache/lxc/download $HDIR/.cache/lxc && \ | ||
66 | chown -R $TUSER: $HDIR/.cache/lxc | ||
67 | |||
68 | -run_cmd lxc-create -t download -n c1 -l trace -o "${UNPRIV_LOG}" -- -d ubuntu -r $release -a $ARCH | ||
69 | +run_cmd lxc-create -t download -n c1 -l trace -o "${UNPRIV_LOG}" -- --no-validate -d ubuntu -r $release -a $ARCH | ||
70 | |||
71 | # Make sure we can start it - twice | ||
72 | |||
73 | Index: lxc-4.0.9/src/tests/lxc-test-usernic.in | ||
74 | =================================================================== | ||
75 | --- lxc-4.0.9.orig/src/tests/lxc-test-usernic.in | ||
76 | +++ lxc-4.0.9/src/tests/lxc-test-usernic.in | ||
77 | @@ -147,7 +147,7 @@ | ||
78 | fi | ||
79 | |||
80 | # Create three containers | ||
81 | -run_cmd "lxc-create -t download -n b1 -- -d ubuntu -r $release -a $ARCH" | ||
82 | +run_cmd "lxc-create -t download -n b1 -- --no-validate -d ubuntu -r $release -a $ARCH" | ||
83 | run_cmd "lxc-start -n b1 -d" | ||
84 | p1=$(run_cmd "lxc-info -n b1 -p -H") | ||
85 | |||