Travis: Skip more integration tests due to flakiness

test/keyspace_test.py
test/initial_sharding.py
test/initial_sharding_bytes.py
test/resharding.py

[ci skip]

Makefile

@@ -68,12 +68,11 @@ site_integration_test_files = \
 	zkocc_test.py
 
 # These tests should be run by developers after making code changes.
-# integration tests that take under 45s to run
+# integration tests that take under 30s to run
 small_integration_test_files = \
 	keyrange_test.py \
 	mysqlctl.py \
 	sharded.py \
-	keyspace_test.py \
 	update_stream.py \
 	schema.py \
 	vertical_split.py \
@@ -82,28 +81,26 @@ small_integration_test_files = \
 	binlog.py \
 	clone.py
 
-# integration tests that take between 45s and 1 min
+# integration tests that take between 30s and 1 min
 medium_integration_test_files = \
 	tabletmanager.py \
 	reparent.py \
 	vtdb_test.py \
-	rowcache_invalidator.py \
-	initial_sharding.py
+	rowcache_invalidator.py
 
-# integration tests that take between 1-2 mins
+# integration tests that take more than a minute
 large_integration_test_files = \
 	vtgatev2_test.py \
-	zkocc_test.py \
-	initial_sharding_bytes.py
-
-# integration tests that take more than 2 mins
-huge_integration_test_files = \
-	resharding.py
+	zkocc_test.py
 
 # these tests are considered too flaky to be included
 # in the continous integration test suites
 ci_skip_integration_test_files = \
-	resharding_bytes.py
+	resharding_bytes.py \
+	resharding.py \
+	initial_sharding_bytes.py \
+	initial_sharding.py \
+	keyspace_test.py
 
 .ONESHELL:
 SHELL = /bin/bash
@@ -132,13 +129,10 @@ medium_integration_test:
 large_integration_test:
 	$(call run_integration_tests, $(large_integration_test_files))
 
-huge_integration_test:
-	$(call run_integration_tests, $(huge_integration_test_files))
-
 ci_skip_integration_test:
 	$(call run_integration_tests, $(ci_skip_integration_test_files))
 
-integration_test: small_integration_test medium_integration_test large_integration_test huge_integration_test ci_skip_integration_test
+integration_test: small_integration_test medium_integration_test large_integration_test ci_skip_integration_test
 
 site_integration_test:
 	$(call run_integration_tests, $(site_integration_test_files))