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') 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 From 7f8643a7820cb5bf3e8e196e31b1fa558b3a2a18 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Tue, 14 Jul 2020 11:01:12 -0500 Subject: [CI:DOCS]Do not copy policy.json into gating image test/policy.json should not need to be copied into the gating image Signed-off-by: Brent Baude --- contrib/gate/Dockerfile | 1 - 1 file changed, 1 deletion(-) (limited to 'contrib') diff --git a/contrib/gate/Dockerfile b/contrib/gate/Dockerfile index 657b5accf..9568038bb 100644 --- a/contrib/gate/Dockerfile +++ b/contrib/gate/Dockerfile @@ -27,7 +27,6 @@ RUN set -x && \ # Install cni config COPY cni/87-podman-bridge.conflist /etc/cni/net.d/87-podman-bridge.conflist # Make sure we have some policy for pulling images -COPY test/policy.json /etc/containers/policy.json COPY test/redhat_sigstore.yaml /etc/containers/registries.d/registry.access.redhat.com.yaml WORKDIR "$GOSRC" -- cgit v1.2.3-54-g00ecf