roachtest: reenable skipped import tests

With cockroachdb#31875 in, import/tpch/nodes=4 has been passing reliably, and the expectation is that the nodes=8,32 versions will follow suit (at least they passed just now). Release note: None
tbg · Nov 30, 2018 · 5ceea1e · 5ceea1e
1 parent 5b6eeb1
commit 5ceea1e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/pkg/cmd/roachtest/import.go b/pkg/cmd/roachtest/import.go
@@ -71,10 +71,9 @@ func registerImportTPCH(r *registry) {
 		nodes   int
 		timeout time.Duration
 	}{
-		{4, 6 * time.Hour},
-		// TODO(peter,tschottdorf): re-enable
-		// {8, 4 * time.Hour},
-		// {32, 3 * time.Hour},
+		{4, 6 * time.Hour}, // typically 4-5h
+		{8, 4 * time.Hour}, // typically 3h
+		{32, 3 * time.Hour},
 	} {
 		r.Add(testSpec{
 			Name:    fmt.Sprintf(`import/tpch/nodes=%d`, item.nodes),

diff --git a/pkg/cmd/roachtest/restore.go b/pkg/cmd/roachtest/restore.go
@@ -218,8 +218,7 @@ func registerRestore(r *registry) {
 		timeout time.Duration
 	}{
 		{10, 6 * time.Hour},
-		// TODO(peter,tschottdorf): re-enable
-		// {32, 3 * time.Hour},
+		{32, 3 * time.Hour},
 	} {
 		r.Add(testSpec{
 			Name:    fmt.Sprintf("restore2TB/nodes=%d", item.nodes),