From 1307799a66adff84e7710df4f7792ca35521525e Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 4 Aug 2016 14:36:25 +0100 Subject: [PATCH] Run 'etcd2' if it exists, in preference to 'etcd' This is to accommodate CoreOS, where 'etcd' is a very old version --- test/e2e_node/e2e_service.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/e2e_node/e2e_service.go b/test/e2e_node/e2e_service.go index 8f8bf890116..7548d3d40cb 100644 --- a/test/e2e_node/e2e_service.go +++ b/test/e2e_node/e2e_service.go @@ -181,7 +181,12 @@ func (es *e2eService) startEtcd() (*killCmd, error) { return nil, err } es.etcdDataDir = dataDir - etcdPath, err := exec.LookPath("etcd") + var etcdPath string + // CoreOS ships a binary named 'etcd' which is really old, so prefer 'etcd2' if it exists + etcdPath, err = exec.LookPath("etcd2") + if err != nil { + etcdPath, err = exec.LookPath("etcd") + } if err != nil { glog.Infof("etcd not found in PATH. Defaulting to %s...", defaultEtcdPath) _, err = os.Stat(defaultEtcdPath)