Merge branch 'stable-3.1'
* stable-3.1:
Dockerfile: Replace javamelody URL with own-branch
Unhardcode wait times in every e2e scenario step
Change-Id: I406b7735ad14bbd25c4bff1a412678182065896d
diff --git a/src/test/docker/gerrit/Dockerfile b/src/test/docker/gerrit/Dockerfile
index f60212b..689d2b7 100644
--- a/src/test/docker/gerrit/Dockerfile
+++ b/src/test/docker/gerrit/Dockerfile
@@ -10,7 +10,7 @@
USER gerrit
-ADD --chown=gerrit:gerrit $GERRIT_CI_URL/plugin-javamelody-bazel-master-$GERRIT_BRANCH/lastSuccessfulBuild/artifact/bazel-bin/plugins/javamelody/javamelody.jar /var/gerrit/plugins/javamelody.jar
+ADD --chown=gerrit:gerrit $GERRIT_CI_URL/plugin-javamelody-bazel-$GERRIT_BRANCH/lastSuccessfulBuild/artifact/bazel-bin/plugins/javamelody/javamelody.jar /var/gerrit/plugins/javamelody.jar
ADD --chown=gerrit:gerrit $GERRIT_CI_URL/plugin-high-availability-bazel-$GERRIT_BRANCH/lastSuccessfulBuild/artifact/bazel-bin/plugins/high-availability/high-availability.jar /var/gerrit/plugins/high-availability.jar
USER root
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 03f516f..9769b6a 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
@@ -44,14 +44,15 @@
setUp(
createProject.test.inject(
+ nothingFor(stepWaitTime(createProject) seconds),
atOnceUsers(1)
),
test.inject(
- nothingFor(2 seconds),
+ nothingFor(stepWaitTime(this) seconds),
atOnceUsers(1)
),
deleteProject.test.inject(
- nothingFor(4 seconds),
+ nothingFor(stepWaitTime(deleteProject) seconds),
atOnceUsers(1)
),
).protocols(gitProtocol, httpProtocol)
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateChangeUsingHAGerrit1.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateChangeUsingHAGerrit1.scala
index cab5797..c9e2dd2 100644
--- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateChangeUsingHAGerrit1.scala
+++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateChangeUsingHAGerrit1.scala
@@ -27,6 +27,8 @@
private val default: String = name
private val numberKey = "_number"
+ override def relativeRuntimeWeight = 10
+
override def replaceOverride(in: String): String = {
replaceProperty("http_port1", 8081, in)
}
@@ -47,18 +49,19 @@
setUp(
createProject.test.inject(
+ nothingFor(stepWaitTime(createProject) seconds),
atOnceUsers(1)
),
test.inject(
- nothingFor(2 seconds),
+ nothingFor(stepWaitTime(this) seconds),
atOnceUsers(1)
),
deleteChange.test.inject(
- nothingFor(20 seconds),
+ nothingFor(stepWaitTime(deleteChange) seconds),
atOnceUsers(1)
),
deleteProject.test.inject(
- nothingFor(40 seconds),
+ nothingFor(stepWaitTime(deleteProject) seconds),
atOnceUsers(1)
),
).protocols(httpProtocol)
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateProjectUsingHAGerritTwice.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateProjectUsingHAGerritTwice.scala
index 44da7db..a4da93c 100644
--- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateProjectUsingHAGerritTwice.scala
+++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateProjectUsingHAGerritTwice.scala
@@ -30,22 +30,23 @@
setUp(
createProject.test.inject(
+ nothingFor(stepWaitTime(createProject) seconds),
atOnceUsers(1)
),
deleteProject.test.inject(
- nothingFor(2 seconds),
+ nothingFor(stepWaitTime(deleteProject) seconds),
atOnceUsers(1)
),
createItAgain.test.inject(
- nothingFor(4 seconds),
+ nothingFor(stepWaitTime(createItAgain) seconds),
atOnceUsers(1)
),
verifyProject.test.inject(
- nothingFor(6 seconds),
+ nothingFor(stepWaitTime(verifyProject) seconds),
atOnceUsers(1)
),
deleteItAfter.test.inject(
- nothingFor(8 seconds),
+ nothingFor(stepWaitTime(deleteItAfter) seconds),
atOnceUsers(1)
),
).protocols(gitProtocol, httpProtocol)
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteChangeUsingHAGerrit2.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteChangeUsingHAGerrit2.scala
index b7c73a9..ba11ee7 100644
--- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteChangeUsingHAGerrit2.scala
+++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteChangeUsingHAGerrit2.scala
@@ -24,6 +24,8 @@
private val data: FileBasedFeederBuilder[Any]#F#F = jsonFile(resource).convert(keys).queue
var number: Option[Int] = None
+ override def relativeRuntimeWeight = 10
+
override def replaceOverride(in: String): String = {
replaceProperty("http_port2", 8082, in)
}
