diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-11-18 15:21:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-18 15:21:44 +0100 |
| commit | 46d1ce434cc7c4149ca9c1ba812888022cfee296 (patch) | |
| tree | 5de27b24d6ab5ac9e5d8799361320c75daf97a6d /controller-server/src/test | |
| parent | 5157613db5dfa2d651363bc56699e9e51b31e9e0 (diff) | |
| parent | f91cc57a8e8ff9b76611d5a2323ee6f071210fb9 (diff) | |
Merge pull request #20085 from vespa-engine/jonmv/vespa-cli-test-runner
Jonmv/vespa cli test runner
Diffstat (limited to 'controller-server/src/test')
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java | 12 | ||||
| -rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd (renamed from controller-server/src/test/resources/test_runner_services.xml-cd-osgi) | 0 | ||||
| -rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd-legacy | 22 |
3 files changed, 3 insertions, 31 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java index 11086ff7663..5cf554f2c01 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java @@ -521,22 +521,16 @@ public class InternalStepRunnerTest { } @Test - public void generates_correct_services_xml_using_osgi_based_runtime() { - generates_correct_services_xml("test_runner_services.xml-cd-osgi", true); + public void generates_correct_services_xml() { + generates_correct_services_xml("test_runner_services.xml-cd"); } - @Test - public void generates_correct_services_xml_using_legacy_runtime() { - generates_correct_services_xml("test_runner_services.xml-cd-legacy", false); - } - - private void generates_correct_services_xml(String filenameExpectedOutput, boolean useOsgiBasedRuntime) { + private void generates_correct_services_xml(String filenameExpectedOutput) { ControllerConfig.Steprunner.Testerapp config = new ControllerConfig.Steprunner.Testerapp.Builder().build(); assertFile(filenameExpectedOutput, new String(InternalStepRunner.servicesXml( true, false, - useOsgiBasedRuntime, new NodeResources(2, 12, 75, 1, NodeResources.DiskSpeed.fast, NodeResources.StorageType.local), config))); } diff --git a/controller-server/src/test/resources/test_runner_services.xml-cd-osgi b/controller-server/src/test/resources/test_runner_services.xml-cd index 634137e3fb6..634137e3fb6 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-cd-osgi +++ b/controller-server/src/test/resources/test_runner_services.xml-cd diff --git a/controller-server/src/test/resources/test_runner_services.xml-cd-legacy b/controller-server/src/test/resources/test_runner_services.xml-cd-legacy deleted file mode 100644 index c6046479934..00000000000 --- a/controller-server/src/test/resources/test_runner_services.xml-cd-legacy +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<services xmlns:deploy='vespa' version='1.0'> - <container version='1.0' id='tester'> - - <component id="com.yahoo.vespa.hosted.testrunner.TestRunner" bundle="vespa-testrunner-components"> - <config name="com.yahoo.vespa.hosted.testrunner.test-runner"> - <artifactsPath>artifacts</artifactsPath> - <surefireMemoryMb>5120</surefireMemoryMb> - <useAthenzCredentials>true</useAthenzCredentials> - <useTesterCertificate>false</useTesterCertificate> - </config> - </component> - - <handler id="com.yahoo.vespa.testrunner.TestRunnerHandler" bundle="vespa-osgi-testrunner"> - <binding>http://*/tester/v1/*</binding> - </handler> - - <nodes count="1" allocated-memory="17%"> - <resources vcpu="2.00" memory="12.00Gb" disk="75.00Gb" disk-speed="fast" storage-type="local"/> - </nodes> - </container> -</services> |