diff options
| author | Morten Tokle <mortent@verizonmedia.com> | 2020-07-02 15:41:58 +0200 |
|---|---|---|
| committer | Morten Tokle <mortent@verizonmedia.com> | 2020-07-02 15:41:58 +0200 |
| commit | 168490db3a4e23c013ba1cc4d3f2e722932751d9 (patch) | |
| tree | 7a4126ac95f41cae59e7134e4d91a271d05fc0f0 /vespa-maven-plugin | |
| parent | db09c980739fdb72694b299e41e23e88e8bb751c (diff) | |
Include staging setup
Diffstat (limited to 'vespa-maven-plugin')
| -rw-r--r-- | vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/GenerateTestDescriptorMojo.java | 1 | ||||
| -rw-r--r-- | vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/TestAnnotationAnalyzer.java | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/GenerateTestDescriptorMojo.java b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/GenerateTestDescriptorMojo.java index 8309b7a8124..259ae2602c4 100644 --- a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/GenerateTestDescriptorMojo.java +++ b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/GenerateTestDescriptorMojo.java @@ -33,6 +33,7 @@ public class GenerateTestDescriptorMojo extends AbstractMojo { TestDescriptor.CURRENT_VERSION, analyzer.systemTests(), analyzer.stagingTests(), + analyzer.stagingSetupTests(), analyzer.productionTests()); writeDescriptorFile(descriptor); } diff --git a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/TestAnnotationAnalyzer.java b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/TestAnnotationAnalyzer.java index c45ef21bc31..e8b29b2b0f7 100644 --- a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/TestAnnotationAnalyzer.java +++ b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/TestAnnotationAnalyzer.java @@ -3,6 +3,7 @@ package ai.vespa.hosted.plugin; import ai.vespa.hosted.cd.ProductionTest; +import ai.vespa.hosted.cd.StagingSetup; import ai.vespa.hosted.cd.StagingTest; import ai.vespa.hosted.cd.SystemTest; import org.objectweb.asm.AnnotationVisitor; @@ -28,10 +29,12 @@ class TestAnnotationAnalyzer { private final List<String> systemTests = new ArrayList<>(); private final List<String> stagingTests = new ArrayList<>(); + private final List<String> stagingSetupTests = new ArrayList<>(); private final List<String> productionTests = new ArrayList<>(); List<String> systemTests() { return systemTests; } List<String> stagingTests() { return stagingTests; } + List<String> stagingSetupTests() { return stagingSetupTests; } List<String> productionTests() { return productionTests; } void analyzeClass(Path classFile) { @@ -65,6 +68,8 @@ class TestAnnotationAnalyzer { productionTests.add(className); } else if (StagingTest.class.getName().equals(annotationClassName)) { stagingTests.add(className); + } else if (StagingSetup.class.getName().equals(annotationClassName)) { + stagingTests.add(className); } else if (SystemTest.class.getName().equals(annotationClassName)) { systemTests.add(className); } |