summaryrefslogtreecommitdiff
path: root/contrib/cirrus
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-08-12 11:20:35 -0400
committerChris Evich <cevich@redhat.com>2019-08-13 09:16:37 -0400
commit386e939acb09c60372453f332d35679177e789d3 (patch)
tree3bb01592168b18ef21d8682add2083123283e76b /contrib/cirrus
parent0bf7d599f8cf54a331b44c6d4781760910c04575 (diff)
downloadpodman-386e939acb09c60372453f332d35679177e789d3.tar.gz
podman-386e939acb09c60372453f332d35679177e789d3.tar.bz2
podman-386e939acb09c60372453f332d35679177e789d3.zip
Cirrus: Install varlink on Ubuntu
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus')
-rwxr-xr-xcontrib/cirrus/check_image.sh5
-rw-r--r--contrib/cirrus/packer/ubuntu_setup.sh1
2 files changed, 2 insertions, 4 deletions
diff --git a/contrib/cirrus/check_image.sh b/contrib/cirrus/check_image.sh
index 53fe3b377..ad9a12f49 100755
--- a/contrib/cirrus/check_image.sh
+++ b/contrib/cirrus/check_image.sh
@@ -23,10 +23,7 @@ item_test 'Minimum available memory' $MEM_FREE -ge $MIN_MEM_MB || let "NFAILS+=1
item_test "remove_packaged_podman_files() did it's job" -z "$(type -P podman)" || let "NFAILS+=1"
# Integration Tests require varlink in Fedora
-if [[ "$OS_RELEASE_ID" == "fedora" ]]
-then
- item_test "The varlink executable is present" -x "$(type -P varlink)" || let "NFAILS+=1"
-fi
+item_test "The varlink executable is present" -x "$(type -P varlink)" || let "NFAILS+=1"
MIN_ZIP_VER='3.0'
VER_RE='.+([[:digit:]]+\.[[:digit:]]+).+'
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index 4b50d6dc3..00d92570f 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -65,6 +65,7 @@ $BIGTO $SUDOAPTGET install \
libnet1-dev \
libnl-3-dev \
libostree-dev \
+ libvarlink \
libprotobuf-c0-dev \
libprotobuf-dev \
libseccomp-dev \