Merge pull request kubernetes#21105 from caesarxuchao/watchCacheForIn…

…tegration turn on and off watch cache in integration test
mikedanese · Feb 12, 2016 · 695211e · 695211e
2 parents 9ceed60 + 18c1eb2
commit 695211e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go
@@ -77,6 +77,7 @@ var (
 	fakeDocker2 = dockertools.NewFakeDockerClient()
 	// Limit the number of concurrent tests.
 	maxConcurrency int
+	watchCache     bool
 
 	longTestTimeout = time.Second * 500
 
@@ -169,6 +170,7 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
 	masterConfig.ReadWritePort = portNumber
 	masterConfig.PublicAddress = hostIP
 	masterConfig.CacheTimeout = 2 * time.Second
+	masterConfig.EnableWatchCache = watchCache
 
 	// Create a master and install handlers into mux.
 	m, err := master.New(masterConfig)
@@ -961,6 +963,8 @@ type testFunc func(*client.Client)
 func addFlags(fs *pflag.FlagSet) {
 	fs.IntVar(
 		&maxConcurrency, "max-concurrency", -1, "Maximum number of tests to be run simultaneously. Unlimited if set to negative.")
+	fs.BoolVar(
+		&watchCache, "watch-cache", false, "Turn on watch cache on API server.")
 }
 
 func main() {

diff --git a/hack/test-integration.sh b/hack/test-integration.sh
@@ -55,10 +55,14 @@ runTests() {
     KUBE_API_VERSIONS="v1,extensions/v1beta1" \
     "${KUBE_ROOT}/hack/test-go.sh" test/integration
 
-  kube::log::status "Running integration test scenario"
+  kube::log::status "Running integration test scenario with watch cache on"
+  KUBE_API_VERSIONS="v1,extensions/v1beta1" KUBE_TEST_API_VERSIONS="$1" "${KUBE_OUTPUT_HOSTBIN}/integration" --v=${LOG_LEVEL} \
+    --max-concurrency="${KUBE_INTEGRATION_TEST_MAX_CONCURRENCY}" --watch-cache=true
 
+  kube::log::status "Running integration test scenario with watch cache off"
   KUBE_API_VERSIONS="v1,extensions/v1beta1" KUBE_TEST_API_VERSIONS="$1" "${KUBE_OUTPUT_HOSTBIN}/integration" --v=${LOG_LEVEL} \
-    --max-concurrency="${KUBE_INTEGRATION_TEST_MAX_CONCURRENCY}"
+    --max-concurrency="${KUBE_INTEGRATION_TEST_MAX_CONCURRENCY}" --watch-cache=false
+
 
   cleanup
 }