diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2021-11-17 15:15:42 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2021-11-17 15:15:42 +0100 |
commit | a2d325add6496dca8e7c396b722bf4e14bb65393 (patch) | |
tree | 7b69117004b71cde075af2de6768dfc67ce899b0 /controller-server/src/test | |
parent | e8e542a66a6bc9b2e33def248f208da63b7b934c (diff) |
Revert "Merge pull request #20066 from vespa-engine/revert-20065-jonmv/vespa-cli-test-runner"
This reverts commit e8e542a66a6bc9b2e33def248f208da63b7b934c, reversing
changes made to 69bd22c6dea4bae7d210a9ea36b31ecd8cd5c7fa.
Diffstat (limited to 'controller-server/src/test')
-rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd-legacy | 2 | ||||
-rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd-osgi | 8 |
2 files changed, 5 insertions, 5 deletions
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 index 125c5004d25..c6046479934 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-cd-legacy +++ b/controller-server/src/test/resources/test_runner_services.xml-cd-legacy @@ -11,7 +11,7 @@ </config> </component> - <handler id="com.yahoo.vespa.hosted.testrunner.TestRunnerHandler" bundle="vespa-testrunner-components"> + <handler id="com.yahoo.vespa.testrunner.TestRunnerHandler" bundle="vespa-osgi-testrunner"> <binding>http://*/tester/v1/*</binding> </handler> 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 index d1a83abff8d..01a7afb3bed 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-cd-osgi +++ b/controller-server/src/test/resources/test_runner_services.xml-cd-osgi @@ -11,6 +11,10 @@ </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"> @@ -20,10 +24,6 @@ </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> |