diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-21 22:08:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 22:08:00 +0200 |
| commit | 8f43d08d966b9519011cb8ca86e2db9f1f18dfcb (patch) | |
| tree | e436080eb7b9659b71e03df367d1ea87cfac8c76 /contrib/cirrus/packer/fedora_setup.sh | |
| parent | cec56b0075eeec6a8cdfba3138dec32fdcd36b47 (diff) | |
| parent | bd0ac639bf1100c268d436bd44032b8fa46b9cc6 (diff) | |
| download | podman-8f43d08d966b9519011cb8ca86e2db9f1f18dfcb.tar.gz podman-8f43d08d966b9519011cb8ca86e2db9f1f18dfcb.tar.bz2 podman-8f43d08d966b9519011cb8ca86e2db9f1f18dfcb.zip | |
Merge pull request #2561 from cevich/cirrus_test_images
Cirrus: Support testing of VM cache-image changes
Diffstat (limited to 'contrib/cirrus/packer/fedora_setup.sh')
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index 36a65eb71..e031129d7 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -8,7 +8,7 @@ set -e # Load in library (copied by packer, before this script was run) source /tmp/libpod/$SCRIPT_BASE/lib.sh -req_env_var SCRIPT_BASE FEDORA_CNI_COMMIT CNI_COMMIT CRIO_COMMIT CRIU_COMMIT RUNC_COMMIT +req_env_var SCRIPT_BASE FEDORA_CNI_COMMIT CNI_COMMIT CONMON_COMMIT CRIU_COMMIT install_ooe @@ -22,6 +22,7 @@ ooe.sh sudo dnf install -y \ bats \ btrfs-progs-devel \ bzip2 \ + criu \ device-mapper-devel \ emacs-nox \ findutils \ @@ -35,6 +36,7 @@ ooe.sh sudo dnf install -y \ gpgme-devel \ iptables \ iproute \ + jq \ libassuan-devel \ libcap-devel \ libnet \ @@ -68,16 +70,14 @@ ooe.sh sudo dnf install -y \ install_varlink +install_conmon + CNI_COMMIT=$FEDORA_CNI_COMMIT install_cni_plugins install_buildah -install_conmon - -install_criu - -install_packer_copied_files +sudo /tmp/libpod/hack/install_catatonit.sh rh_finalize # N/B: Halts system! |