From 17e6797d725937db65c4bfd5c0c47e8df2b92c3d Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Tue, 7 Jun 2016 15:45:10 +0200 Subject: [PATCH] Decouple explicit access from port 80 Flake #26210 only happens for port 80. To decouple the possible causes, all tests with explicit port 80 are moved to port 1080 (these were 80% of the flakes). The urls without a specified port (which map to port 80 though) are left untouched. If port 1080 does not show up as flake now, there is really a connection to the actual port number. --- test/e2e/proxy.go | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/test/e2e/proxy.go b/test/e2e/proxy.go index 7737948b11c..c752a2e1471 100644 --- a/test/e2e/proxy.go +++ b/test/e2e/proxy.go @@ -115,9 +115,10 @@ func proxyContext(version string) { Replicas: 1, PollInterval: time.Second, Env: map[string]string{ - "SERVE_PORT_80": `test`, - "SERVE_PORT_160": "foo", - "SERVE_PORT_162": "bar", + "SERVE_PORT_80": `test`, + "SERVE_PORT_1080": `test`, + "SERVE_PORT_160": "foo", + "SERVE_PORT_162": "bar", "SERVE_TLS_PORT_443": `test`, "SERVE_TLS_PORT_460": `tls baz`, @@ -184,21 +185,21 @@ func proxyContext(version string) { subresourceServiceProxyURL("https", "tlsportname1") + "/": "tls baz", subresourceServiceProxyURL("https", "tlsportname2") + "/": "tls qux", - podProxyURL("", "80") + "/": `test`, - podProxyURL("", "160") + "/": "foo", - podProxyURL("", "162") + "/": "bar", + podProxyURL("", "1080") + "/": `test`, + podProxyURL("", "160") + "/": "foo", + podProxyURL("", "162") + "/": "bar", - podProxyURL("http", "80") + "/": `test`, - podProxyURL("http", "160") + "/": "foo", - podProxyURL("http", "162") + "/": "bar", + podProxyURL("http", "1080") + "/": `test`, + podProxyURL("http", "160") + "/": "foo", + podProxyURL("http", "162") + "/": "bar", - subresourcePodProxyURL("", "") + "/": `test`, - subresourcePodProxyURL("", "80") + "/": `test`, - subresourcePodProxyURL("http", "80") + "/": `test`, - subresourcePodProxyURL("", "160") + "/": "foo", - subresourcePodProxyURL("http", "160") + "/": "foo", - subresourcePodProxyURL("", "162") + "/": "bar", - subresourcePodProxyURL("http", "162") + "/": "bar", + subresourcePodProxyURL("", "") + "/": `test`, + subresourcePodProxyURL("", "1080") + "/": `test`, + subresourcePodProxyURL("http", "1080") + "/": `test`, + subresourcePodProxyURL("", "160") + "/": "foo", + subresourcePodProxyURL("http", "160") + "/": "foo", + subresourcePodProxyURL("", "162") + "/": "bar", + subresourcePodProxyURL("http", "162") + "/": "bar", subresourcePodProxyURL("https", "443") + "/": `test`, subresourcePodProxyURL("https", "460") + "/": "tls baz",