diff options
| author |   Toine Siebelink <toine.siebelink@est.tech> | 2020-12-17 11:26:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-12-17 11:26:17 +0000 |
| commit | 951b41eb70a8dfb90dc357cb20bda07a832eaec1 (patch) | |
| tree | ab8778e4260a8ee174fdc35ca23bc889d452a4ed | |
| parent | 5337a5f3f75de945b612068fd441bfa416084440 (diff) | |
| parent | bf02f2083a6e55874eb7852f9eeedaaa7a491804 (diff) | |
Merge "Enable tests using test containers on jenkins"
| -rwxr-xr-x | cps-dependencies/pom.xml | 2 | ||||
| -rw-r--r-- | cps-parent/pom.xml | 28 |
2 files changed, 9 insertions, 21 deletions
diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml index 5c94387db4..a77deff98a 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 9c1760cf23..55db1a198e 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> |