Install git during circleci setup (#1878)

CircleCI builds were failing because sbt shells out to git but the command was not found. Install git before invoking sbt. Also fix some tests that were broken as a result of a bad automatic merge. Signed-off-by: Alex Leong <alex@buoyant.io>
linkerd · Mar 28, 2018 · 5eff2d3 · 5eff2d3
1 parent 019608d
commit 5eff2d3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -66,6 +66,7 @@ jobs:
       - run:
           name: Install sbt dependencies
           command: |
+            apt-get update && apt-get install -y --no-install-recommends git
             sh -x ci/update.sh
 
       # Download and install npm dependencies. They may already be in cache.

diff --git a/namer/consul/src/test/scala/io/buoyant/namer/consul/ConsulTest.scala b/namer/consul/src/test/scala/io/buoyant/namer/consul/ConsulTest.scala
@@ -73,7 +73,7 @@ class ConsulTest extends FunSuite {
     assert(consul.preferServiceAddress == Some(false))
     assert(consul.weights == Some(Seq(TagWeight("primary", 100.0))))
     val clientAuth = ClientAuth("/certificates/cert.pem", "/certificates/key.pem")
-    val tlsConfig = TlsClientConfig(Some(false), Some("consul.io"), Some(List("/certificates/cacert.pem")), Some(clientAuth))
+    val tlsConfig = TlsClientConfig(None, Some(false), Some("consul.io"), Some(List("/certificates/cacert.pem")), Some(clientAuth))
     assert(consul.tls == Some(tlsConfig))
     assert(!consul.disabled)
   }

diff --git a/namerd/storage/consul/src/test/scala/io/buoyant/namerd/storage/consul/ConsulConfigTest.scala b/namerd/storage/consul/src/test/scala/io/buoyant/namerd/storage/consul/ConsulConfigTest.scala
@@ -43,7 +43,7 @@ class ConsulConfigTest extends FunSuite with OptionValues {
     assert(consul.readConsistencyMode == Some(ConsistencyMode.Stale))
     assert(consul.writeConsistencyMode == Some(ConsistencyMode.Consistent))
     val clientAuth = ClientAuth("/certificates/cert.pem", "/certificates/key.pem")
-    val tlsConfig = TlsClientConfig(Some(false), Some("consul.io"), Some(List("/certificates/cacert.pem")), Some(clientAuth))
+    val tlsConfig = TlsClientConfig(None, Some(false), Some("consul.io"), Some(List("/certificates/cacert.pem")), Some(clientAuth))
     assert(consul.tls == Some(tlsConfig))
   }
 

diff --git a/test-util/src/main/scala/io/buoyant/test/BudgetedRetries.scala b/test-util/src/main/scala/io/buoyant/test/BudgetedRetries.scala
@@ -18,7 +18,7 @@ trait BudgetedRetries extends FunSuite with Retries {
     if (isRetryable(test)) withRetries(test, retries)
     else super.withFixture(test)
 
-  private[this] def withRetries (test: NoArgTest, remaining: Int): Outcome =
+  private[this] def withRetries(test: NoArgTest, remaining: Int): Outcome =
     super.withFixture(test) match {
       case Failed(_) | Canceled(_) if remaining == 1 => super.withFixture(test)
       case Failed(_) | Canceled(_) => withRetries(test, remaining - 1)