diff options
| author | Chris Evich <cevich@redhat.com> | 2020-03-09 16:53:25 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2020-03-19 12:28:24 -0400 |
| commit | 6ac04366ee64b9938dfb4801a528986fc8cb9956 (patch) | |
| tree | c4b88d28c61982e81c45bcec32892f5910ee1a4a /contrib/cirrus/packer | |
| parent | e810dd135ebe1bc732d411a2bcab574e06c41bb4 (diff) | |
| download | podman-6ac04366ee64b9938dfb4801a528986fc8cb9956.tar.gz podman-6ac04366ee64b9938dfb4801a528986fc8cb9956.tar.bz2 podman-6ac04366ee64b9938dfb4801a528986fc8cb9956.zip | |
Cirrus: Enable future installing buildah packages
Many of the packages required for CI in buildah overlap with libpod.
When building new VM images, attempt to source a package list
from the buildah repository. If found, also install the listed
packages on the VM.
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/packer')
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 2 | ||||
| -rw-r--r-- | contrib/cirrus/packer/ubuntu_setup.sh | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index cc7f1c34f..81a46b13f 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -120,6 +120,8 @@ esac echo "Installing general build/test dependencies for Fedora '$OS_RELEASE_VER'" $BIGTO ooe.sh sudo dnf install -y ${INSTALL_PACKAGES[@]} +install_buildah_packages + [[ "${#REMOVE_PACKAGES[@]}" -eq "0" ]] || \ $LILTO ooe.sh sudo dnf erase -y ${REMOVE_PACKAGES[@]} diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh index a270faf45..46e7a620f 100644 --- a/contrib/cirrus/packer/ubuntu_setup.sh +++ b/contrib/cirrus/packer/ubuntu_setup.sh @@ -158,6 +158,8 @@ echo "Installing general testing and system dependencies" $LILTO $SUDOAPTGET update $BIGTO $SUDOAPTGET install ${INSTALL_PACKAGES[@]} +install_buildah_packages + echo "Installing cataonit and libseccomp.sudo" ooe.sh sudo /tmp/libpod/hack/install_catatonit.sh ooe.sh sudo make -C /tmp/libpod install.libseccomp.sudo |