summaryrefslogtreecommitdiff
path: root/test/helpers.bash
diff options
context:
space:
mode:
Diffstat (limited to 'test/helpers.bash')
-rw-r--r--test/helpers.bash8
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