diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-30 15:49:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-30 15:49:26 +0100 |
| commit | a35d002b722c9beb711796de4a62faf30d067387 (patch) | |
| tree | 8d85600990c53b23867409f25aaaf8715e5879ea /contrib/cirrus | |
| parent | 63b57f5147462bef19df842f9c92868f7bdaea8a (diff) | |
| parent | 2046be6ae04603a581d3caffb26fc970f43765a2 (diff) | |
| download | podman-a35d002b722c9beb711796de4a62faf30d067387.tar.gz podman-a35d002b722c9beb711796de4a62faf30d067387.tar.bz2 podman-a35d002b722c9beb711796de4a62faf30d067387.zip | |
Merge pull request #4376 from giuseppe/drop-ostree
build: drop support for ostree
Diffstat (limited to 'contrib/cirrus')
| -rw-r--r-- | contrib/cirrus/container_test.sh | 2 | ||||
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 2 | ||||
| -rw-r--r-- | contrib/cirrus/packer/ubuntu_setup.sh | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/contrib/cirrus/container_test.sh b/contrib/cirrus/container_test.sh index 9d3f09f60..4624868f1 100644 --- a/contrib/cirrus/container_test.sh +++ b/contrib/cirrus/container_test.sh @@ -89,7 +89,7 @@ if [ "${CONTAINER_RUNTIME}" == "none" ]; then fi -export TAGS="seccomp $($GOSRC/hack/btrfs_tag.sh) $($GOSRC/hack/libdm_tag.sh) $($GOSRC/hack/btrfs_installed_tag.sh) $($GOSRC/hack/ostree_tag.sh) $($GOSRC/hack/selinux_tag.sh)" +export TAGS="seccomp $($GOSRC/hack/btrfs_tag.sh) $($GOSRC/hack/libdm_tag.sh) $($GOSRC/hack/btrfs_installed_tag.sh) $($GOSRC/hack/selinux_tag.sh)" # Validate if [ $validate -eq 1 ]; then diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index 38b9e6860..6cfaa05ce 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -69,8 +69,6 @@ ooe.sh sudo dnf install -y \ make \ msitools \ nmap-ncat \ - ostree \ - ostree-devel \ pandoc \ podman \ procps-ng \ diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh index 2f54da9ed..118ee062a 100644 --- a/contrib/cirrus/packer/ubuntu_setup.sh +++ b/contrib/cirrus/packer/ubuntu_setup.sh @@ -83,7 +83,6 @@ $BIGTO $SUDOAPTGET install \ libnet1 \ libnet1-dev \ libnl-3-dev \ - libostree-dev \ libvarlink \ libprotobuf-c-dev \ libprotobuf-dev \ |