From 2cb70024b7c3160b19a6ede318b72290ac21387d Mon Sep 17 00:00:00 2001 From: Deep Debroy Date: Tue, 14 May 2019 13:27:18 -0700 Subject: [PATCH] Consider WINDOWS_BASE_IMAGE_TAG override when setting Windows base image for tests Signed-off-by: Deep Debroy (cherry picked from commit 15419d7ba09bb48dec59c73af51a0fd005eeb460) Signed-off-by: Sebastiaan van Stijn Upstream-commit: fed2792d8570d50bb36572286dd84b23dd7fc08d Component: engine --- .../engine/internal/test/environment/environment.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/components/engine/internal/test/environment/environment.go b/components/engine/internal/test/environment/environment.go index 5538d2097e..76f94a559a 100644 --- a/components/engine/internal/test/environment/environment.go +++ b/components/engine/internal/test/environment/environment.go @@ -75,10 +75,13 @@ func getPlatformDefaults(info types.Info, osType string) PlatformDefaults { } case "windows": baseImage := "microsoft/windowsservercore" - if override := os.Getenv("WINDOWS_BASE_IMAGE"); override != "" { - baseImage = override - fmt.Println("INFO: Windows Base image is ", baseImage) + if overrideBaseImage := os.Getenv("WINDOWS_BASE_IMAGE"); overrideBaseImage != "" { + baseImage = overrideBaseImage + if overrideBaseImageTag := os.Getenv("WINDOWS_BASE_IMAGE_TAG"); overrideBaseImageTag != "" { + baseImage = baseImage + ":" + overrideBaseImageTag + } } + fmt.Println("INFO: Windows Base image is ", baseImage) return PlatformDefaults{ BaseImage: baseImage, VolumesConfigPath: filepath.FromSlash(volumesPath),