diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-07-02 14:03:13 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-07-02 14:05:04 +0200 |
| commit | 5247bef4d4c58db7fb8716b654d47a41d6acd0a9 (patch) | |
| tree | 23081ea7cfb2f9de5014a22bf322ccee1f358686 /controller-server/src/test/resources | |
| parent | fe3c3cf89121d7c225c4c950cd97c22542137858 (diff) | |
Use new OSGi based tester runtime in tester app
Diffstat (limited to 'controller-server/src/test/resources')
| -rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd-legacy (renamed from controller-server/src/test/resources/test_runner_services.xml-cd) | 0 | ||||
| -rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd-osgi | 26 |
2 files changed, 26 insertions, 0 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-legacy index 125c5004d25..125c5004d25 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-cd +++ b/controller-server/src/test/resources/test_runner_services.xml-cd-legacy 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-osgi new file mode 100644 index 00000000000..806c6befad0 --- /dev/null +++ b/controller-server/src/test/resources/test_runner_services.xml-cd-osgi @@ -0,0 +1,26 @@ +<?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> + + <component id="ai.vespa.hosted.cd.cloud.impl.VespaTestRuntimeProvider" bundle="cloud-tenant-cd" /> + + <component id="com.yahoo.vespa.testrunner.JunitRunner" bundle="vespa-osgi-testrunner" /> + + <handler id="com.yahoo.vespa.testrunner.JunitHandler" 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> |