diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-13 16:24:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-13 16:24:32 +0200 |
| commit | 7a859f064a1f4a5a7eb5ab0d8d175c2f0b0de497 (patch) | |
| tree | 1ae14113e67cf1b67a40a7befe0693f045962a34 | |
| parent | b6c9b108670361a59435a3641d486e6086c9bab3 (diff) | |
| parent | 386e939acb09c60372453f332d35679177e789d3 (diff) | |
| download | podman-7a859f064a1f4a5a7eb5ab0d8d175c2f0b0de497.tar.gz podman-7a859f064a1f4a5a7eb5ab0d8d175c2f0b0de497.tar.bz2 podman-7a859f064a1f4a5a7eb5ab0d8d175c2f0b0de497.zip | |
Merge pull request #3791 from cevich/install_libvarlink
Cirrus: Install varlink in VM images
| -rwxr-xr-x | contrib/cirrus/check_image.sh | 3 | ||||
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 1 | ||||
| -rw-r--r-- | contrib/cirrus/packer/ubuntu_setup.sh | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/contrib/cirrus/check_image.sh b/contrib/cirrus/check_image.sh index c8e8c4c63..ad9a12f49 100755 --- a/contrib/cirrus/check_image.sh +++ b/contrib/cirrus/check_image.sh @@ -22,6 +22,9 @@ 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 +item_test "The varlink executable is present" -x "$(type -P varlink)" || let "NFAILS+=1" + 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 \ 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 \ |