diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-11 21:40:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-11 21:40:30 +0200 |
| commit | f8a84fdcff12fdc150bb303d0004d5ba0cd6087b (patch) | |
| tree | 5628def27288b40542087e444a824e100cd3ab80 /contrib | |
| parent | c385f33cdf5e480b4c3f03227989cd56563d9cc0 (diff) | |
| parent | 8baa897356d1c48044c8e38ac08ec89919082339 (diff) | |
| download | podman-f8a84fdcff12fdc150bb303d0004d5ba0cd6087b.tar.gz podman-f8a84fdcff12fdc150bb303d0004d5ba0cd6087b.tar.bz2 podman-f8a84fdcff12fdc150bb303d0004d5ba0cd6087b.zip | |
Merge pull request #3261 from cevich/no_buildah
Remove source-built buildah from CI
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 2 | ||||
| -rw-r--r-- | contrib/cirrus/packer/ubuntu_setup.sh | 2 | ||||
| -rw-r--r-- | contrib/gate/Dockerfile | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index 33e240895..4388dc992 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -76,8 +76,6 @@ install_conmon CNI_COMMIT=$FEDORA_CNI_COMMIT install_cni_plugins -install_buildah - sudo /tmp/libpod/hack/install_catatonit.sh rh_finalize # N/B: Halts system! diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh index 17e274d97..f183932c1 100644 --- a/contrib/cirrus/packer/ubuntu_setup.sh +++ b/contrib/cirrus/packer/ubuntu_setup.sh @@ -99,8 +99,6 @@ install_conmon install_cni_plugins -install_buildah - sudo /tmp/libpod/hack/install_catatonit.sh install_varlink diff --git a/contrib/gate/Dockerfile b/contrib/gate/Dockerfile index 9a6f5dc8d..630371c76 100644 --- a/contrib/gate/Dockerfile +++ b/contrib/gate/Dockerfile @@ -2,7 +2,6 @@ FROM fedora:29 RUN dnf -y install \ atomic-registries \ btrfs-progs-devel \ - buildah \ bzip2 \ conmon \ container-selinux \ |