diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-07-02 15:37:10 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-07-02 15:37:10 +0200 |
| commit | 55600d8d66561ad15de879eddf865c444189afbf (patch) | |
| tree | 8fd9cedc7534eeaba11342048c207552a0c6355c /controller-server | |
| parent | 5247bef4d4c58db7fb8716b654d47a41d6acd0a9 (diff) | |
Use correct handler. Update version threshold
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 4 | ||||
| -rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd-osgi | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index 6b09a77328d..0ef25d0f613 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -794,7 +794,7 @@ public class InternalStepRunner implements StepRunner { ZoneId zone = id.type().zone(controller.system()); boolean useTesterCertificate = controller.system().isPublic() && id.type().environment().isTest(); - boolean useOsgiBasedTestRuntime = testerPlatformVersion(id).isAfter(new Version(7, 246)); + boolean useOsgiBasedTestRuntime = testerPlatformVersion(id).isAfter(new Version(7, 247, 11)); byte[] servicesXml = servicesXml(! controller.system().isPublic(), useTesterCertificate, @@ -871,7 +871,7 @@ public class InternalStepRunner implements StepRunner { "\n" + " <component id=\"com.yahoo.vespa.testrunner.JunitRunner\" bundle=\"vespa-osgi-testrunner\" />\n" + "\n" + - " <handler id=\"com.yahoo.vespa.testrunner.JunitHandler\" bundle=\"vespa-osgi-testrunner\">\n" + + " <handler id=\"com.yahoo.vespa.testrunner.TestRunnerHandler\" bundle=\"vespa-osgi-testrunner\">\n" + " <binding>http://*/tester/v1/*</binding>\n" + " </handler>\n" : 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 806c6befad0..03277628156 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 @@ -15,7 +15,7 @@ <component id="com.yahoo.vespa.testrunner.JunitRunner" bundle="vespa-osgi-testrunner" /> - <handler id="com.yahoo.vespa.testrunner.JunitHandler" bundle="vespa-osgi-testrunner"> + <handler id="com.yahoo.vespa.testrunner.TestRunnerHandler" bundle="vespa-osgi-testrunner"> <binding>http://*/tester/v1/*</binding> </handler> |