| commit | d76de38a8907f0215aea522a86273c552bd83811 | [log] [tgz] |
|---|---|---|
| author | Marco Miller <marco.miller@ericsson.com> | Mon May 31 13:27:39 2021 -0400 |
| committer | Marco Miller <marco.miller@ericsson.com> | Mon May 31 13:27:39 2021 -0400 |
| tree | b8a3aae435a0bc54fd3d57ea83e6ffede2dfde04 | |
| parent | 39caf614b691dd79b752b6f80962534e0909977f [diff] | |
| parent | 9e71aa4e1278b078594bb1a9a2c142a3b724c8c0 [diff] |
Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: test/docker: adapt packages to CentOS 8 Set Gerrit to 3.2.10 on test/docker e2e-tests: Fix regex to adapt to JSON_COMPACT Use Gerrit 3.1.15 in Dockerfile Change-Id: Id26eb7be0f06526821a6ce1aafe01b1cf6b966de
diff --git a/src/test/docker/gerrit/Dockerfile b/src/test/docker/gerrit/Dockerfile index 5f455d4..3c74b10 100644 --- a/src/test/docker/gerrit/Dockerfile +++ b/src/test/docker/gerrit/Dockerfile
@@ -1,12 +1,12 @@ -FROM gerritcodereview/gerrit:3.1.12 +FROM gerritcodereview/gerrit:3.2.10 -ENV GERRIT_BRANCH=stable-3.1 +ENV GERRIT_BRANCH=stable-3.2 ENV GERRIT_CI_URL=https://gerrit-ci.gerritforge.com/job USER root -RUN yum install -y iputils-ping netcat curl lsof gettext moreutils net-tools netcat inetutils-ping sudo +RUN yum install -y iputils nmap curl lsof gettext net-tools sudo USER gerrit
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala index 6a0d07f..7e63134 100644 --- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala +++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala
@@ -42,7 +42,7 @@ } }) .exec(http(uniqueName).get("${url}") - .check(regex("\"" + memKey + "\": (\\d+)") + .check(regex("\"" + memKey + "\":(\\d+)") .is(session => session(entriesKey).as[String]))) setUp(
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/GetProjectsCacheEntries.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/GetProjectsCacheEntries.scala index ed19c0b..8a04245 100644 --- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/GetProjectsCacheEntries.scala +++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/GetProjectsCacheEntries.scala
@@ -31,7 +31,7 @@ val test: ScenarioBuilder = scenario(uniqueName) .feed(data) .exec(http(uniqueName).get("${url}") - .check(regex("\"" + memKey + "\": (\\d+)").saveAs(entriesKey))) + .check(regex("\"" + memKey + "\":(\\d+)").saveAs(entriesKey))) .exec(session => { if (consumer.nonEmpty) { consumer.get.entriesBeforeFlush(session(entriesKey).as[Int])