commit c9a2d05a9fceaa872e538cae32d66001f446fd82
author David Pursehouse <dpursehouse@collab.net> Thu Apr 09 11:15:30 2020 +0900
committer David Pursehouse <dpursehouse@collab.net> Thu Apr 09 11:15:30 2020 +0900
tree 04ae7bf50599178d9ee65b190553b55066563912
parent 3bcbbfa87ef443759e312798246f73a7322e3c26
parent 0c8c426a22d3d436bc2513ba440d65215604040c

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  e2e-tests: Fix CloneUsingHAGerrit2 wait times
  Bump Bazel version to 3.0.0

Change-Id: I36b0548cc030998ab119e2cd520e1eaf0ff249aa

.bazelversion

diff --git a/.bazelversion b/.bazelversion
index ccbccc3..4a36342 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-2.2.0
+3.0.0

src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CloneUsingHAGerrit2.scala

diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CloneUsingHAGerrit2.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CloneUsingHAGerrit2.scala
index 9b457ac..9d4d582 100644
--- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CloneUsingHAGerrit2.scala
+++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CloneUsingHAGerrit2.scala
@@ -42,11 +42,11 @@
       atOnceUsers(1)
     ),
     test.inject(
-      nothingFor(1 second),
+      nothingFor(2 seconds),
       atOnceUsers(1)
     ),
     deleteProject.test.inject(
-      nothingFor(3 second),
+      nothingFor(4 seconds),
       atOnceUsers(1)
     ),
   ).protocols(gitProtocol, httpProtocol)