diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-11-17 19:48:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-17 19:48:03 +0100 |
commit | 55f27e2ad4fb5272120e50d51ccc6fd1f0b2bfbb (patch) | |
tree | f0be57b19b3f908145e0b7c0440d4aa99ddb9ff9 /controller-server/src | |
parent | ab3518e8b3a4caf742e12a134c4fb1d2bbf3c293 (diff) | |
parent | fbdc8549df12ffd68f470bdbabff72d49951cf61 (diff) |
Merge pull request #20071 from vespa-engine/jonmv/vespa-cli-test-runnerv7.503.19
Jonmv/vespa cli test runner
Diffstat (limited to 'controller-server/src')
3 files changed, 19 insertions, 23 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 577dab69279..8563375ab5c 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 @@ -640,6 +640,7 @@ public class InternalStepRunner implements StepRunner { return Optional.of(testFailure); case ERROR: logger.log(INFO, "Tester failed running its tests!"); + controller.jobController().updateTestReport(id); return Optional.of(error); case SUCCESS: logger.log("Tests completed successfully."); @@ -919,24 +920,16 @@ public class InternalStepRunner implements StepRunner { String runtimeProviderClass = config.runtimeProviderClass(); String tenantCdBundle = config.tenantCdBundle(); - String handlerAndExtraComponents = useOsgiBasedTestRuntime - ? + String extraJUnitComponents = + "\n" + " <component id=\"" + runtimeProviderClass + "\" bundle=\"" + tenantCdBundle + "\" />\n" + - "\n" + - " <component id=\"com.yahoo.vespa.testrunner.JunitRunner\" bundle=\"vespa-osgi-testrunner\">\n" + - " <config name=\"com.yahoo.vespa.testrunner.junit-test-runner\">\n" + - " <artifactsPath>artifacts</artifactsPath>\n" + - " <useAthenzCredentials>" + systemUsesAthenz + "</useAthenzCredentials>\n" + - " </config>\n" + - " </component>\n" + - "\n" + - " <handler id=\"com.yahoo.vespa.testrunner.TestRunnerHandler\" bundle=\"vespa-osgi-testrunner\">\n" + - " <binding>http://*/tester/v1/*</binding>\n" + - " </handler>\n" - : - " <handler id=\"com.yahoo.vespa.hosted.testrunner.TestRunnerHandler\" bundle=\"vespa-testrunner-components\">\n" + - " <binding>http://*/tester/v1/*</binding>\n" + - " </handler>\n"; + "\n" + + " <component id=\"com.yahoo.vespa.testrunner.JunitRunner\" bundle=\"vespa-osgi-testrunner\">\n" + + " <config name=\"com.yahoo.vespa.testrunner.junit-test-runner\">\n" + + " <artifactsPath>artifacts</artifactsPath>\n" + + " <useAthenzCredentials>" + systemUsesAthenz + "</useAthenzCredentials>\n" + + " </config>\n" + + " </component>\n"; String servicesXml = "<?xml version='1.0' encoding='UTF-8'?>\n" + @@ -952,7 +945,10 @@ public class InternalStepRunner implements StepRunner { " </config>\n" + " </component>\n" + "\n" + - handlerAndExtraComponents + + " <handler id=\"com.yahoo.vespa.testrunner.TestRunnerHandler\" bundle=\"vespa-osgi-testrunner\">\n" + + " <binding>http://*/tester/v1/*</binding>\n" + + " </handler>\n" + + (useOsgiBasedTestRuntime ? extraJUnitComponents : "") + "\n" + " <nodes count=\"1\" allocated-memory=\"" + jdiscMemoryPct + "%\">\n" + " " + resourceString + "\n" + 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> |