Merge #25156

25156: roachtest: fix `unzip` command not found. r=windchan7 a=windchan7 Fixes `debug.go` roachtest that `unzip` command not found in gce. Install `unzip` before running command. Fixes #25152. Release note: None Co-authored-by: Victor Chen <[email protected]>
cockroachdb · Apr 29, 2018 · b1d18df · b1d18df
2 parents 7da41fb + caed419
commit b1d18df
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/pkg/cmd/roachtest/debug.go b/pkg/cmd/roachtest/debug.go
@@ -37,6 +37,10 @@ func registerDebug(r *registry) {
 				return err
 			}
 
+			if err := c.RunE(ctx, c.Node(node), "sudo apt-get install unzip"); err != nil {
+				return err
+			}
+
 			if err := c.RunE(ctx, c.Node(node), "unzip "+file); err != nil {
 				return err
 			}
@@ -45,7 +49,15 @@ func registerDebug(r *registry) {
 				return err
 			}
 
-			return c.RunE(ctx, c.Node(node), "grep 'server_version' ./debug/gossip/nodes")
+			if err := c.RunE(ctx, c.Node(node), "grep 'server_version' ./debug/gossip/nodes"); err != nil {
+				return err
+			}
+
+			if err := c.RunE(ctx, c.Node(node), "rm -rf debug"); err != nil {
+				return err
+			}
+
+			return c.RunE(ctx, c.Node(node), "rm "+file)
 		}
 
 		// Wait until each nodes has at least 3 replications.