diff options
| author | Chris Evich <cevich@redhat.com> | 2019-08-12 10:56:30 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-08-13 09:16:37 -0400 |
| commit | 0bf7d599f8cf54a331b44c6d4781760910c04575 (patch) | |
| tree | b2997243dd756874ff97787c1d9faaba4ba6ea4d | |
| parent | 031437bf5b19b5121224cdec301dd9945f38e610 (diff) | |
| download | podman-0bf7d599f8cf54a331b44c6d4781760910c04575.tar.gz podman-0bf7d599f8cf54a331b44c6d4781760910c04575.tar.bz2 podman-0bf7d599f8cf54a331b44c6d4781760910c04575.zip | |
Cirrus: Install varlink on Fedora
Signed-off-by: Chris Evich <cevich@redhat.com>
| -rwxr-xr-x | contrib/cirrus/check_image.sh | 6 | ||||
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 1 |
2 files changed, 7 insertions, 0 deletions
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 \ |