Merge pull request cri-o#7087 from saschagrunert/test-cni-plugin-dir

Try to find `CONTAINER_CNI_PLUGIN_DIR` by binary lookup
saschagrunert · Jun 30, 2023 · 56b712d · 56b712d
2 parents 3be2913 + 6b9e49d
commit 56b712d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/test/common.sh b/test/common.sh
@@ -38,7 +38,11 @@ CONTAINER_UID_MAPPINGS=${CONTAINER_UID_MAPPINGS:-}
 CONTAINER_GID_MAPPINGS=${CONTAINER_GID_MAPPINGS:-}
 OVERRIDE_OPTIONS=${OVERRIDE_OPTIONS:-}
 # CNI path
-CONTAINER_CNI_PLUGIN_DIR=${CONTAINER_CNI_PLUGIN_DIR:-/opt/cni/bin}
+if command -v host-local >/dev/null; then
+ CONTAINER_CNI_PLUGIN_DIR=${CONTAINER_CNI_PLUGIN_DIR:-$(dirname "$(readlink "$(command -v host-local)")")}
+else
+ CONTAINER_CNI_PLUGIN_DIR=${CONTAINER_CNI_PLUGIN_DIR:-/opt/cni/bin}
+fi
 # Runtime
 CONTAINER_DEFAULT_RUNTIME=${CONTAINER_DEFAULT_RUNTIME:-runc}
 RUNTIME_BINARY_PATH=$(command -v "$CONTAINER_DEFAULT_RUNTIME")