From 0bf7d599f8cf54a331b44c6d4781760910c04575 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Mon, 12 Aug 2019 10:56:30 -0400 Subject: Cirrus: Install varlink on Fedora Signed-off-by: Chris Evich --- contrib/cirrus/check_image.sh | 6 ++++++ contrib/cirrus/packer/fedora_setup.sh | 1 + 2 files changed, 7 insertions(+) (limited to 'contrib') diff --git a/contrib/cirrus/check_image.sh b/contrib/cirrus/check_image.sh index c8e8c4c63..53fe3b377 100755 --- a/contrib/cirrus/check_image.sh +++ b/contrib/cirrus/check_image.sh @@ -22,6 +22,12 @@ item_test 'Minimum available memory' $MEM_FREE -ge $MIN_MEM_MB || let "NFAILS+=1 # binary anywhere; that could potentially taint our results. 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 + MIN_ZIP_VER='3.0' VER_RE='.+([[:digit:]]+\.[[:digit:]]+).+' ACTUAL_VER=$(zip --version 2>&1 | egrep -m 1 "Zip$VER_RE" | sed -r -e "s/$VER_RE/\\1/") diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index f73df4182..0e1a82cc0 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -53,6 +53,7 @@ ooe.sh sudo dnf install -y \ libseccomp \ libseccomp-devel \ libselinux-devel \ + libvarlink-util \ lsof \ make \ nmap-ncat \ -- cgit v1.2.3-54-g00ecf From 386e939acb09c60372453f332d35679177e789d3 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Mon, 12 Aug 2019 11:20:35 -0400 Subject: Cirrus: Install varlink on Ubuntu Signed-off-by: Chris Evich --- contrib/cirrus/check_image.sh | 5 +---- contrib/cirrus/packer/ubuntu_setup.sh | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'contrib') 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 \ -- cgit v1.2.3-54-g00ecf