diff options
| author | Brent Baude <bbaude@redhat.com> | 2020-07-13 10:34:41 -0500 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2020-07-15 11:42:04 +0200 |
| commit | 2c72fbdd82253835e7a082cd1ced1fa21f543bea (patch) | |
| tree | 8c5d740cdcf8375c26d010d2652d54e6e49fcb61 /contrib | |
| parent | 79167a157f3bb733b928f445009e9675c46c3baa (diff) | |
| download | podman-2c72fbdd82253835e7a082cd1ced1fa21f543bea.tar.gz podman-2c72fbdd82253835e7a082cd1ced1fa21f543bea.tar.bz2 podman-2c72fbdd82253835e7a082cd1ced1fa21f543bea.zip | |
Fix systemd pid 1 test
fedora removed the systemd package from its standard container image causing our systemd pid1 test to fail. Replacing usage of fedora to ubi-init.
adding ubi images to the cache for local tests.
also, remove installation of test/policy.json to the system wide /etc/containers
Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cirrus/lib.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index a048a3068..c77eaca12 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -392,7 +392,6 @@ install_test_configs() { # as the default). This config prevents allocation of network address space used # by default in google cloud. https://cloud.google.com/vpc/docs/vpc#ip-ranges install -v -D -m 644 $SCRIPT_BASE/99-do-not-use-google-subnets.conflist /etc/cni/net.d/ - install -v -D -m 644 ./test/policy.json /etc/containers/ install -v -D -m 644 ./test/registries.conf /etc/containers/ } |