summaryrefslogtreecommitdiff
path: root/.papr.yml
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2018-01-16 17:33:56 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-01-27 06:48:20 +0000
commit3aa63b2b941aac40c5e3639b0880922b842052ab (patch)
tree83bc6337500b3f5ef0f94a0f94f87f6a3549f01b /.papr.yml
parentfb58b873981d2fd0d4f97036afab2aa2ce9e1633 (diff)
downloadpodman-3aa63b2b941aac40c5e3639b0880922b842052ab.tar.gz
podman-3aa63b2b941aac40c5e3639b0880922b842052ab.tar.bz2
podman-3aa63b2b941aac40c5e3639b0880922b842052ab.zip
Remove conmon, get package from CRI-O
conmon should not be built in two different places. conmon is now a separate package in Fedora so we can just add requires, for use on Ubuntu we can just require cri-o to be installed. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #151 Approved by: mheon
Diffstat (limited to '.papr.yml')
-rw-r--r--.papr.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/.papr.yml b/.papr.yml
index b82f7df61..993407e9d 100644
--- a/.papr.yml
+++ b/.papr.yml
@@ -15,6 +15,7 @@ tests:
- CRIO_ROOT=/var/tmp/checkout PODMAN_BINARY=/usr/bin/podman CONMON_BINARY=/usr/libexec/crio/conmon PAPR=1 sh .papr.sh
packages:
+ - cri-o
- containernetworking-cni
extra-repos:
@@ -32,5 +33,8 @@ extra-repos:
- name: epel
metalink: https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch
gpgcheck: 0
+ - name: cri-o
+ baseurl: https://cbs.centos.org/repos/virt7-container-common-candidate/$basearch/os
+ gpgcheck: 0
context: centos/7/atomic/smoketested