diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-19 23:29:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 23:29:03 +0200 |
| commit | 9ac3a03d041161bed934ca0259fb70072b9cd8d0 (patch) | |
| tree | d3c934cf8ff2a6caf78a51f931034ec57d0089be /contrib/cirrus/lib.sh | |
| parent | 1deb4d1d70efb6d62f4fe5e735c94523f930b6d7 (diff) | |
| parent | c50d37bc1045f1a493c89137eb1139cf5d910e0f (diff) | |
| download | podman-9ac3a03d041161bed934ca0259fb70072b9cd8d0.tar.gz podman-9ac3a03d041161bed934ca0259fb70072b9cd8d0.tar.bz2 podman-9ac3a03d041161bed934ca0259fb70072b9cd8d0.zip | |
Merge pull request #7381 from baude/v2CIFix
Fix v2.0.x CI
Diffstat (limited to 'contrib/cirrus/lib.sh')
| -rw-r--r-- | contrib/cirrus/lib.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index c77eaca12..2619a144e 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -393,6 +393,11 @@ install_test_configs() { # 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/registries.conf /etc/containers/ + # This needs to removed when we have a seccomp profile + # that works on ubuntu with runc + if [[ -f "seccomp.json" ]]; then + install -v -D -m 644 ./seccomp.json /usr/share/containers + fi } # Remove all files provided by the distro version of podman. |