From a391f44d86a9343bce2f655283aec7d90c3f965d Mon Sep 17 00:00:00 2001
From: Claudiu Belu <cbelu@cloudbasesolutions.com>
Date: Thu, 9 Jan 2020 11:16:36 -0800
Subject: [PATCH] tests: Uses newly promoted httpd and nginx images

The new images contain a few Windows fixes required to run properly.
---
 test/utils/image/manifest.go | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go
index f2c4fa97548..c29489475ad 100644
--- a/test/utils/image/manifest.go
+++ b/test/utils/image/manifest.go
@@ -36,7 +36,6 @@ type RegistryList struct {
 	PromoterE2eRegistry     string `yaml:"promoterE2eRegistry"`
 	BuildImageRegistry      string `yaml:"buildImageRegistry"`
 	InvalidRegistry         string `yaml:"invalidRegistry"`
-	GcHttpdRegistry         string `yaml:"gcHttpdRegistry"`
 	GcEtcdRegistry          string `yaml:"gcEtcdRegistry"`
 	GcRegistry              string `yaml:"gcRegistry"`
 	SigStorageRegistry      string `yaml:"sigStorageRegistry"`
@@ -77,7 +76,6 @@ func initReg() RegistryList {
 		BuildImageRegistry:      "k8s.gcr.io/build-image",
 		InvalidRegistry:         "invalid.com/invalid",
 		GcEtcdRegistry:          "k8s.gcr.io",
-		GcHttpdRegistry:         "k8s.gcr.io/e2e-test-images",
 		GcRegistry:              "k8s.gcr.io",
 		SigStorageRegistry:      "k8s.gcr.io/sig-storage",
 		GcrReleaseRegistry:      "gcr.io/gke-release",
@@ -116,7 +114,6 @@ var (
 	buildImageRegistry      = registry.BuildImageRegistry
 	gcAuthenticatedRegistry = registry.GcAuthenticatedRegistry
 	gcEtcdRegistry          = registry.GcEtcdRegistry
-	gcHttpdRegistry         = registry.GcHttpdRegistry
 	gcRegistry              = registry.GcRegistry
 	sigStorageRegistry      = registry.SigStorageRegistry
 	gcrReleaseRegistry      = registry.GcrReleaseRegistry
@@ -233,16 +230,16 @@ func initImageConfigs() (map[int]Config, map[int]Config) {
 	configs[EchoServer] = Config{promoterE2eRegistry, "echoserver", "2.3"}
 	configs[Etcd] = Config{gcEtcdRegistry, "etcd", "3.4.13-0"}
 	configs[GlusterDynamicProvisioner] = Config{promoterE2eRegistry, "glusterdynamic-provisioner", "v1.0"}
-	configs[Httpd] = Config{gcHttpdRegistry, "httpd", "2.4.38-alpine"}
-	configs[HttpdNew] = Config{gcHttpdRegistry, "httpd", "2.4.39-alpine"}
+	configs[Httpd] = Config{promoterE2eRegistry, "httpd", "2.4.38-1"}
+	configs[HttpdNew] = Config{promoterE2eRegistry, "httpd", "2.4.39-1"}
 	configs[InvalidRegistryImage] = Config{invalidRegistry, "alpine", "3.1"}
 	configs[IpcUtils] = Config{promoterE2eRegistry, "ipc-utils", "1.2"}
 	configs[JessieDnsutils] = Config{promoterE2eRegistry, "jessie-dnsutils", "1.4"}
 	configs[Kitten] = Config{promoterE2eRegistry, "kitten", "1.4"}
 	configs[Nautilus] = Config{promoterE2eRegistry, "nautilus", "1.4"}
 	configs[NFSProvisioner] = Config{sigStorageRegistry, "nfs-provisioner", "v2.2.2"}
-	configs[Nginx] = Config{promoterE2eRegistry, "nginx", "1.14-alpine"}
-	configs[NginxNew] = Config{promoterE2eRegistry, "nginx", "1.15-alpine"}
+	configs[Nginx] = Config{promoterE2eRegistry, "nginx", "1.14-1"}
+	configs[NginxNew] = Config{promoterE2eRegistry, "nginx", "1.15-1"}
 	configs[NodePerfNpbEp] = Config{promoterE2eRegistry, "node-perf/npb-ep", "1.1"}
 	configs[NodePerfNpbIs] = Config{promoterE2eRegistry, "node-perf/npb-is", "1.1"}
 	configs[NodePerfTfWideDeep] = Config{promoterE2eRegistry, "node-perf/tf-wide-deep", "1.1"}