From 2c129e4d6ab1bf0a8fab9e9b454e6c40ab4edcf6 Mon Sep 17 00:00:00 2001 From: Random-Liu Date: Wed, 16 Aug 2017 23:15:11 -0700 Subject: [PATCH] Add instance metadata from flag even when using image config. --- test/e2e_node/runner/remote/run_remote.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/e2e_node/runner/remote/run_remote.go b/test/e2e_node/runner/remote/run_remote.go index 14460219064..bf9fb7f1d4c 100644 --- a/test/e2e_node/runner/remote/run_remote.go +++ b/test/e2e_node/runner/remote/run_remote.go @@ -208,11 +208,15 @@ func main() { images = []string{imageConfig.Image} } for _, image := range images { + metadata := imageConfig.Metadata + if len(strings.TrimSpace(*instanceMetadata)) > 0 { + metadata += "," + *instanceMetadata + } gceImage := internalGCEImage{ image: image, imageDesc: imageConfig.ImageDesc, project: imageConfig.Project, - metadata: getImageMetadata(imageConfig.Metadata), + metadata: getImageMetadata(metadata), machine: imageConfig.Machine, tests: imageConfig.Tests, resources: imageConfig.Resources,