diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-01-16 17:33:56 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-01-27 06:48:20 +0000 |
| commit | 3aa63b2b941aac40c5e3639b0880922b842052ab (patch) | |
| tree | 83bc6337500b3f5ef0f94a0f94f87f6a3549f01b /test/helpers.bash | |
| parent | fb58b873981d2fd0d4f97036afab2aa2ce9e1633 (diff) | |
| download | podman-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 'test/helpers.bash')
| -rw-r--r-- | test/helpers.bash | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/helpers.bash b/test/helpers.bash index 16f3483f6..222e7bb26 100644 --- a/test/helpers.bash +++ b/test/helpers.bash @@ -18,12 +18,14 @@ else fi PODMAN_BINARY=${PODMAN_BINARY:-${CRIO_ROOT}/bin/podman} -# Path of the conmon binary. -CONMON_BINARY=${CONMON_BINARY:-${CRIO_ROOT}/bin/conmon} # Path of the default seccomp profile. SECCOMP_PROFILE=${SECCOMP_PROFILE:-${CRIO_ROOT}/seccomp.json} # Name of the default apparmor profile. APPARMOR_PROFILE=${APPARMOR_PROFILE:-crio-default} +# Conmon +CONMON=${CONMON:-conmon} +CONMON_PATH=$(command -v $CONMON || true) +CONMON_BINARY=${CONMON_PATH:-/usr/libexec/crio/conmon} # Runtime RUNTIME=${RUNTIME:-runc} RUNTIME_PATH=$(command -v $RUNTIME || true) @@ -116,8 +118,6 @@ cp ${CRIO_ROOT}/cni/* ${LIBPOD_CNI_CONFIG} PODMAN_OPTIONS="--root $TESTDIR/crio $STORAGE_OPTIONS --runroot $TESTDIR/crio-run --runtime ${RUNTIME_BINARY} --conmon ${CONMON_BINARY} --cni-config-dir ${LIBPOD_CNI_CONFIG}" -cp "$CONMON_BINARY" "$TESTDIR/conmon" - PATH=$PATH:$TESTDIR for key in ${!IMAGES[@]}; do |