diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2019-08-16 15:51:00 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2019-08-16 15:51:00 +0200 |
| commit | 92832bbb4e7d32258448bd76cb320a7190456ae2 (patch) | |
| tree | cbf5319f795149ec08ed77dd81204c3431df2352 /tenant-base | |
| parent | f9ab8f501a1b476d0f2f3aafec12093ca2929617 (diff) | |
Rename integration test categories and simplify pom.xml setup
Diffstat (limited to 'tenant-base')
| -rw-r--r-- | tenant-base/pom.xml | 58 |
1 files changed, 2 insertions, 56 deletions
diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml index f087a8019da..3710fd738bc 100644 --- a/tenant-base/pom.xml +++ b/tenant-base/pom.xml @@ -37,6 +37,7 @@ <compiler_plugin_version>3.8.0</compiler_plugin_version> <surefire_version>2.22.0</surefire_version> <endpoint>https://api.vespa-external.aws.oath.cloud:4443</endpoint> + <test.categories>!integration</test.categories> </properties> <dependencyManagement> @@ -214,54 +215,6 @@ </plugins> </build> </profile> - - <profile> - <id>system-tests</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <groups>ai.vespa.hosted.cd.SystemTest</groups> - <excludedGroups>ai.vespa.hosted.cd.EmptyGroup</excludedGroups> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>staging-tests</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <groups>ai.vespa.hosted.cd.StagingTest</groups> - <excludedGroups>ai.vespa.hosted.cd.EmptyGroup</excludedGroups> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>production-tests</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <groups>ai.vespa.hosted.cd.ProductionTest</groups> - <excludedGroups>ai.vespa.hosted.cd.EmptyGroup</excludedGroups> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> <build> @@ -273,7 +226,7 @@ <artifactId>maven-surefire-plugin</artifactId> <version>${surefire_version}</version> <configuration> - <reportsDirectory>${env.TEST_DIR}</reportsDirectory> + <groups>${test.categories}</groups> <redirectTestOutputToFile>false</redirectTestOutputToFile> <trimStackTrace>false</trimStackTrace> <systemPropertyVariables> @@ -368,13 +321,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludedGroups> - ai.vespa.hosted.cd.SystemTest, - ai.vespa.hosted.cd.StagingTest, - ai.vespa.hosted.cd.ProductionTest - </excludedGroups> - </configuration> </plugin> </plugins> </build> |