diff options
author | jonmv <venstad@gmail.com> | 2022-09-14 17:01:35 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-09-14 17:01:35 +0200 |
commit | be83470ad483aec5b8984ca13e889e7493a341d4 (patch) | |
tree | f5887d90004278cadde1c6b9742f7fd7ba1644dc /controller-server/src/test/resources | |
parent | cb4511771916c9c96bd17fba30e46a9f1b0110f7 (diff) |
No need to reserved memory for Maven, when it is not used
Diffstat (limited to 'controller-server/src/test/resources')
-rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd | 1 | ||||
-rw-r--r-- | controller-server/src/test/resources/test_runner_services_with_legacy_tests.xml-cd | 40 |
2 files changed, 40 insertions, 1 deletions
diff --git a/controller-server/src/test/resources/test_runner_services.xml-cd b/controller-server/src/test/resources/test_runner_services.xml-cd index 526fd12965b..4bf3a78801d 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-cd +++ b/controller-server/src/test/resources/test_runner_services.xml-cd @@ -33,7 +33,6 @@ </component> <nodes count="1"> - <jvm allocated-memory="17%"/> <resources vcpu="2.00" memory="12.00Gb" disk="75.00Gb" disk-speed="fast" storage-type="local"/> </nodes> </container> diff --git a/controller-server/src/test/resources/test_runner_services_with_legacy_tests.xml-cd b/controller-server/src/test/resources/test_runner_services_with_legacy_tests.xml-cd new file mode 100644 index 00000000000..526fd12965b --- /dev/null +++ b/controller-server/src/test/resources/test_runner_services_with_legacy_tests.xml-cd @@ -0,0 +1,40 @@ +<?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> + + <component id="ai.vespa.hosted.cd.cloud.impl.VespaTestRuntimeProvider" bundle="cloud-tenant-cd" /> + + <component id="com.yahoo.vespa.testrunner.JunitRunner" bundle="vespa-osgi-testrunner"> + <config name="com.yahoo.vespa.testrunner.junit-test-runner"> + <artifactsPath>artifacts</artifactsPath> + <useAthenzCredentials>true</useAthenzCredentials> + </config> + </component> + + <component id="com.yahoo.vespa.testrunner.VespaCliTestRunner" bundle="vespa-osgi-testrunner"> + <config name="com.yahoo.vespa.testrunner.vespa-cli-test-runner"> + <artifactsPath>artifacts</artifactsPath> + <testsPath>tests</testsPath> + <useAthenzCredentials>true</useAthenzCredentials> + </config> + </component> + + <nodes count="1"> + <jvm allocated-memory="17%"/> + <resources vcpu="2.00" memory="12.00Gb" disk="75.00Gb" disk-speed="fast" storage-type="local"/> + </nodes> + </container> +</services> |