diff options
| author | Chris Evich <cevich@redhat.com> | 2019-10-03 16:35:38 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-10-07 11:27:45 -0400 |
| commit | 09b6cd06c8f832af3e81fe6e0e11492944d01b94 (patch) | |
| tree | f13ebcde691f360c0045b4f8f89b3af926d8ffc0 | |
| parent | 589261f275b485d78a6ac1bd7b95578257fc020f (diff) | |
| download | podman-09b6cd06c8f832af3e81fe6e0e11492944d01b94.tar.gz podman-09b6cd06c8f832af3e81fe6e0e11492944d01b94.tar.bz2 podman-09b6cd06c8f832af3e81fe6e0e11492944d01b94.zip | |
Cirrus: Install conmon in Fedora VMs
This is needed because older versions of podman (1.5.1) do not
automatically install the new conmon package.
Also, include removal of `/usr/libexec/podman/conmon` when preparing to
install and test podman built from source.
Signed-off-by: Chris Evich <cevich@redhat.com>
| -rw-r--r-- | contrib/cirrus/lib.sh | 4 | ||||
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index fe4c25e73..94a94f70d 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -370,8 +370,8 @@ remove_packaged_podman_files() { # yum/dnf/dpkg may list system directories, only remove files $LISTING_CMD | while read fullpath do - # TODO: This can go away when conmon gets it's own package - if [[ -d "$fullpath" ]] || [[ $(basename "$fullpath") == "conmon" ]] ; then continue; fi + # Sub-directories may contain unrelated/valuable stuff + if [[ -d "$fullpath" ]]; then continue; fi ooe.sh sudo rm -vf "$fullpath" done diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index 679ad3b8d..38b9e6860 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -31,6 +31,7 @@ ooe.sh sudo dnf install -y \ bridge-utils \ btrfs-progs-devel \ bzip2 \ + conmon \ container-selinux \ containernetworking-plugins \ containers-common \ |