diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-11-17 15:09:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-17 15:09:03 +0100 |
| commit | e1955589f6f56337a669fe89ad22a68b349f3880 (patch) | |
| tree | ece01b8ca55e5e855e4164f704e8d92ef308bbf0 /controller-server/src/test | |
| parent | 69bd22c6dea4bae7d210a9ea36b31ecd8cd5c7fa (diff) | |
Revert "Jonmv/vespa cli test runner"
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 c6046479934..125c5004d25 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.testrunner.TestRunnerHandler" bundle="vespa-osgi-testrunner"> + <handler id="com.yahoo.vespa.hosted.testrunner.TestRunnerHandler" bundle="vespa-testrunner-components"> <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 01a7afb3bed..d1a83abff8d 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,10 +11,6 @@ </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"> @@ -24,6 +20,10 @@ </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> |