summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorBrent Baude <bbaude@redhat.com>2020-07-13 10:34:41 -0500
committerBrent Baude <bbaude@redhat.com>2020-07-13 17:11:26 -0500
commit99cc07670099cbfa4bfc2dc7b24b39b254bc9561 (patch)
tree70c86f1e9b77595505c820b03eab4edd3feae580 /contrib
parente2a8e037d1c3a2176cd15493812bf165faea63f2 (diff)
downloadpodman-99cc07670099cbfa4bfc2dc7b24b39b254bc9561.tar.gz
podman-99cc07670099cbfa4bfc2dc7b24b39b254bc9561.tar.bz2
podman-99cc07670099cbfa4bfc2dc7b24b39b254bc9561.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.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index 66e8060cf..2375d512e 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/
}