Merge "Enable tests using test containers on jenkins"
diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml
index 5c94387..a77deff 100755
--- a/cps-dependencies/pom.xml
+++ b/cps-dependencies/pom.xml
@@ -26,7 +26,7 @@
<springboot.version>2.3.3.RELEASE</springboot.version>
<springfox.version>3.0.0</springfox.version>
<swagger.version>2.1.4</swagger.version>
- <testcontainers.version>1.15.0</testcontainers.version>
+ <testcontainers.version>1.15.1</testcontainers.version>
<yangtools.version>5.0.6</yangtools.version>
</properties>
diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index 9c1760c..55db1a1 100644
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -94,26 +94,6 @@
</pluginManagement>
</build>
</profile>
- <profile>
- <id>skip-db-tests</id>
- <activation>
- <!-- exclude module tests by default till Jenkins is configured to support test containers -->
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/spi/impl/*Test.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<dependencyManagement>
@@ -334,6 +314,14 @@
<excludes>
<exclude>**/IT*.java</exclude>
</excludes>
+ <environmentVariables>
+ <!--
+ disable privileged container usage to cleanup the test containers;
+ these will be removed automatically on jvm termination;
+ see https://www.testcontainers.org/features/configuration/#disabling-ryuk
+ -->
+ <TESTCONTAINERS_RYUK_DISABLED>true</TESTCONTAINERS_RYUK_DISABLED>
+ </environmentVariables>
</configuration>
</plugin>
<plugin>