From 28cb59943b74d616495699740bc01cf59941d5e1 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Thu, 1 Aug 2019 16:08:11 -0400 Subject: [PATCH] tests: do not require actual docker cli Other CLI tools, such as podman, and equivalent to docker so support setting an environment var to use it. Signed-off-by: John Mulligan --- tests/framework/utils/k8s_helper.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/framework/utils/k8s_helper.go b/tests/framework/utils/k8s_helper.go index 4c4b35067..f3a5f4178 100644 --- a/tests/framework/utils/k8s_helper.go +++ b/tests/framework/utils/k8s_helper.go @@ -105,7 +105,11 @@ func (k8sh *K8sHelper) MakeContext() *clusterd.Context { } func (k8sh *K8sHelper) GetDockerImage(image string) error { - return k8sh.executor.ExecuteCommand(false, "", "docker", "pull", image) + dockercmd := os.Getenv("DOCKERCMD") + if dockercmd == "" { + dockercmd = "docker" + } + return k8sh.executor.ExecuteCommand(false, "", dockercmd, "pull", image) } // SetDeploymentVersion sets the container version on the deployment. It is assumed to be the rook/ceph image.