diff options
5 files changed, 30 insertions, 10 deletions
diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml index de710e6e1b8..3c48d22085e 100644 --- a/tenant-base/pom.xml +++ b/tenant-base/pom.xml @@ -217,14 +217,14 @@ </profile> <profile> - <id>functional-tests</id> + <id>system-tests</id> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <groups>ai.vespa.hosted.cd.FunctionalTest</groups> + <groups>ai.vespa.hosted.cd.SystemTest</groups> <excludedGroups>ai.vespa.hosted.cd.EmptyGroup</excludedGroups> </configuration> </plugin> @@ -233,14 +233,14 @@ </profile> <profile> - <id>upgrade-tests</id> + <id>staging-tests</id> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <groups>ai.vespa.hosted.cd.UpgradeTest</groups> + <groups>ai.vespa.hosted.cd.StagingTest</groups> <excludedGroups>ai.vespa.hosted.cd.EmptyGroup</excludedGroups> </configuration> </plugin> @@ -371,8 +371,8 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludedGroups> - ai.vespa.hosted.cd.FunctionalTest, - ai.vespa.hosted.cd.UpgradeTest, + ai.vespa.hosted.cd.SystemTest, + ai.vespa.hosted.cd.StagingTest, ai.vespa.hosted.cd.ProductionTest </excludedGroups> </configuration> diff --git a/tenant-cd/src/main/java/ai/vespa/hosted/cd/StagingTest.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/StagingTest.java new file mode 100644 index 00000000000..ee2ee0add4c --- /dev/null +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/StagingTest.java @@ -0,0 +1,10 @@ +// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package ai.vespa.hosted.cd; + +/** + * @deprecated Use {@link UpgradeTest}. + */ +@Deprecated +public class StagingTest { + +} diff --git a/tenant-cd/src/main/java/ai/vespa/hosted/cd/SystemTest.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/SystemTest.java new file mode 100644 index 00000000000..6a8d1b4cbe4 --- /dev/null +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/SystemTest.java @@ -0,0 +1,10 @@ +// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package ai.vespa.hosted.cd; + +/** + * @deprecated use {@link FunctionalTest}. + */ +@Deprecated +public class SystemTest { + +} diff --git a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestProfile.java b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestProfile.java index 8170af15535..018acb17387 100644 --- a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestProfile.java +++ b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestProfile.java @@ -6,8 +6,8 @@ package com.yahoo.vespa.hosted.testrunner; */ enum TestProfile { - SYSTEM_TEST("ai.vespa.hosted.cd.FunctionalTest, com.yahoo.vespa.tenant.systemtest.base.SystemTest", true), - STAGING_TEST("ai.vespa.hosted.cd.UpgradeTest, com.yahoo.vespa.tenant.systemtest.base.StagingTest", true), + SYSTEM_TEST("ai.vespa.hosted.cd.SystemTest, com.yahoo.vespa.tenant.systemtest.base.SystemTest", true), + STAGING_TEST("ai.vespa.hosted.cd.StagingTest, com.yahoo.vespa.tenant.systemtest.base.StagingTest", true), PRODUCTION_TEST("ai.vespa.hosted.cd.ProductionTest, com.yahoo.vespa.tenant.systemtest.base.ProductionTest", false); private final String group; diff --git a/vespa-testrunner-components/src/test/resources/pom.xml_system_tests b/vespa-testrunner-components/src/test/resources/pom.xml_system_tests index d4b5bd54404..86c36afd636 100644 --- a/vespa-testrunner-components/src/test/resources/pom.xml_system_tests +++ b/vespa-testrunner-components/src/test/resources/pom.xml_system_tests @@ -47,10 +47,10 @@ <dependenciesToScan> <dependency>com.yahoo.vespa.testrunner.test:main.jar</dependency> </dependenciesToScan> - <groups>ai.vespa.hosted.cd.FunctionalTest, com.yahoo.vespa.tenant.systemtest.base.SystemTest</groups> + <groups>ai.vespa.hosted.cd.SystemTest, com.yahoo.vespa.tenant.systemtest.base.SystemTest</groups> <excludedGroups>com.yahoo.vespa.tenant.systemtest.base.impl.EmptyExcludeGroup.class</excludedGroups> <excludes> - <exclude>ai.vespa.hosted.cd.FunctionalTest, com.yahoo.vespa.tenant.systemtest.base.SystemTest</exclude> + <exclude>ai.vespa.hosted.cd.SystemTest, com.yahoo.vespa.tenant.systemtest.base.SystemTest</exclude> </excludes> <reportsDirectory>${env.TEST_DIR}</reportsDirectory> <redirectTestOutputToFile>false</redirectTestOutputToFile> |