Skip to content

Commit

Permalink
Merge #24615
Browse files Browse the repository at this point in the history
24615: roachtest: Fix java installation line for jepsen r=petermattis a=bdarnell

I thought this was running in a context where all whitespace was
equivalent, but I was wrong.

Release note: None

Co-authored-by: Ben Darnell <[email protected]>
  • Loading branch information
craig[bot] and bdarnell committed Apr 10, 2018
2 parents a087abc + 43f9238 commit dea27d4
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions pkg/cmd/roachtest/jepsen.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ func runJepsen(ctx context.Context, t *test, c *cluster) {
c.Run(ctx, c.All(), "tar --transform s,^,cockroach/, -c -z -f cockroach.tgz cockroach")

// Install Jepsen and its prereqs on the controller.
c.Run(ctx, controller, "sh", "-c", `"sudo apt-get -qqy install
openjdk-8-jre openjdk-8-jre-headless libjna-java gnuplot > /dev/null 2>&1"`)
c.Run(ctx, controller, "sh", "-c", `"sudo apt-get -qqy install openjdk-8-jre openjdk-8-jre-headless libjna-java gnuplot > /dev/null 2>&1"`)
c.Run(ctx, controller, "test -x lein || (curl -o lein https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein && chmod +x lein)")
c.GitClone(ctx, "https://github.com/cockroachdb/jepsen", "./jepsen", "tc-nightly", controller)

Expand Down

0 comments on commit dea27d4

Please sign in to comment.