From 2c72fbdd82253835e7a082cd1ced1fa21f543bea Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Mon, 13 Jul 2020 10:34:41 -0500 Subject: 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 --- contrib/cirrus/lib.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'contrib/cirrus') 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/ } -- cgit v1.2.3-54-g00ecf