From 86936539b2b80cc0786ed77cce2c1af032f33b02 Mon Sep 17 00:00:00 2001 From: Sen Lu Date: Tue, 3 Oct 2017 16:47:14 -0700 Subject: [PATCH] Add a flag to customize config relative dir --- test/e2e_node/runner/remote/run_remote.go | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/test/e2e_node/runner/remote/run_remote.go b/test/e2e_node/runner/remote/run_remote.go index f18a9c66691..0fe2b05cf92 100644 --- a/test/e2e_node/runner/remote/run_remote.go +++ b/test/e2e_node/runner/remote/run_remote.go @@ -28,6 +28,7 @@ import ( "net/http" "os" "os/exec" + "path/filepath" "regexp" "sort" "strings" @@ -50,6 +51,7 @@ var instanceNamePrefix = flag.String("instance-name-prefix", "", "prefix for ins var zone = flag.String("zone", "", "gce zone the hosts live in") var project = flag.String("project", "", "gce project the hosts live in") var imageConfigFile = flag.String("image-config-file", "", "yaml file describing images to run") +var imageConfigDir = flag.String("image-config-dir", "", "(optional)path to image config files") var imageProject = flag.String("image-project", "", "gce project the hosts live in") var images = flag.String("images", "", "images to test") var hosts = flag.String("hosts", "", "hosts to test") @@ -177,8 +179,13 @@ func main() { images: make(map[string]internalGCEImage), } if *imageConfigFile != "" { + configPath := *imageConfigFile + if *imageConfigDir != "" { + configPath = filepath.Join(*imageConfigDir, *imageConfigFile) + } + // parse images - imageConfigData, err := ioutil.ReadFile(*imageConfigFile) + imageConfigData, err := ioutil.ReadFile(configPath) if err != nil { glog.Fatalf("Could not read image config file provided: %v", err) } @@ -694,9 +701,13 @@ func parseInstanceMetadata(str string) map[string]string { glog.Fatalf("Invalid instance metadata: %q", s) continue } - v, err := ioutil.ReadFile(kp[1]) + metaPath := kp[1] + if *imageConfigDir != "" { + metaPath = filepath.Join(*imageConfigDir, metaPath) + } + v, err := ioutil.ReadFile(metaPath) if err != nil { - glog.Fatalf("Failed to read metadata file %q: %v", kp[1], err) + glog.Fatalf("Failed to read metadata file %q: %v", metaPath, err) continue } metadata[kp[0]] = string(v)