Merge branch 'stable-3.0'
* stable-3.0:
Fix the version of postgresql used in the test container
Factor creation of test container out to a common method
Upgrade bazlets to latest stable-2.16 to build with 2.16.9 API
Upgrade bazlets to latest stable-2.15
Upgrade bazlets to latest stable-2.14
Change-Id: I0f2031e674d5612094f9960f7e07d967acf39fd1
diff --git a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresModuleTest.java b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresModuleTest.java
index a9d4001..7721b8c 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresModuleTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresModuleTest.java
@@ -16,6 +16,7 @@
import static com.ericsson.gerrit.plugins.gcconductor.postgresqueue.TestUtil.configMockFor;
import static com.ericsson.gerrit.plugins.gcconductor.postgresqueue.TestUtil.invalidConfigMockFor;
+import static com.ericsson.gerrit.plugins.gcconductor.postgresqueue.TestUtil.newContainer;
import static com.google.common.truth.Truth.assertThat;
import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import static org.mockito.Mockito.doThrow;
@@ -41,7 +42,7 @@
@BeforeClass
public static void startPostgres() {
- container = new PostgreSQLContainer<>();
+ container = newContainer();
container.start();
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresQueueTest.java b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresQueueTest.java
index 8777f18..aab695c 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresQueueTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/PostgresQueueTest.java
@@ -15,6 +15,7 @@
package com.ericsson.gerrit.plugins.gcconductor.postgresqueue;
import static com.ericsson.gerrit.plugins.gcconductor.postgresqueue.TestUtil.configMockFor;
+import static com.ericsson.gerrit.plugins.gcconductor.postgresqueue.TestUtil.newContainer;
import static com.google.common.truth.Truth.assertThat;
import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import static org.mockito.ArgumentMatchers.anyString;
@@ -46,7 +47,7 @@
@BeforeClass
public static void startPostgres() {
- container = new PostgreSQLContainer<>();
+ container = newContainer();
container.start();
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/TestUtil.java b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/TestUtil.java
index a90f0f4..fdecce3 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/TestUtil.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/postgresqueue/TestUtil.java
@@ -23,6 +23,11 @@
@Ignore
public class TestUtil {
+ private static final String LABEL = PostgreSQLContainer.IMAGE + ":" + "9.6.12-alpine";
+
+ static PostgreSQLContainer<?> newContainer() {
+ return new PostgreSQLContainer<>(LABEL);
+ }
static EvaluatorConfig configMockFor(PostgreSQLContainer<?> container) {
EvaluatorConfig configMock = mock(EvaluatorConfig.class);
