Use ENV overrides instead of arguments

2 files changed, 11 insertions, 10 deletions

diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/VespaCliTestRunner.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/VespaCliTestRunner.java
index 1f9216192fc..29857102151 100644
--- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/VespaCliTestRunner.java
+++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/VespaCliTestRunner.java
@@ -101,12 +101,11 @@ public class VespaCliTestRunner implements TestRunner {
                 .flatMap(testsPath -> getChildDirectory(testsPath, toSuiteDirectoryName(suite)))
                 .orElseThrow(() -> new IllegalStateException("No tests found, for suite '" + suite + "'"));
 
-        ProcessBuilder builder = new ProcessBuilder("vespa", "test", suitePath.toAbsolutePath().toString(),
-                                                    "--application", config.application().toFullString(),
-                                                    "--endpoints", toEndpointsConfig(config),
-                                                    "--data-plane-public-cert", artifactsPath.resolve("cert").toAbsolutePath().toString(),
-                                                    "--data-plane-private-key", artifactsPath.resolve("key").toAbsolutePath().toString());
+        ProcessBuilder builder = new ProcessBuilder("vespa", "test", suitePath.toAbsolutePath().toString());
         builder.redirectErrorStream(true);
+        builder.environment().put("VESPA_CLI_ENDPOINTS", toEndpointsConfig(config));
+        builder.environment().put("VESPA_CLI_DATA_PLANE_KEY_FILE", artifactsPath.resolve("key").toAbsolutePath().toString());
+        builder.environment().put("VESPA_CLI_DATA_PLANE_CERT_FILE", artifactsPath.resolve("cert").toAbsolutePath().toString());
         return builder;
     }
 
diff --git a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/VespaCliTestRunnerTest.java b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/VespaCliTestRunnerTest.java
index be00f28d2c9..54554bd3a2e 100644
--- a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/VespaCliTestRunnerTest.java
+++ b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/VespaCliTestRunnerTest.java
@@ -55,12 +55,14 @@ class VespaCliTestRunnerTest {
 
         Path systemTests = Files.createDirectory(tests.resolve("system-test"));
         ProcessBuilder builder = runner.testRunProcessBuilder(TestRunner.Suite.SYSTEM_TEST, testConfig);
-        assertEquals(List.of("vespa", "test", systemTests.toAbsolutePath().toString(),
-                             "--application", "t.a.i",
-                             "--endpoints", "{\"endpoints\":[{\"cluster\":\"default\",\"url\":\"https://dev.endpoint:443/\"}]}",
-                             "--data-plane-public-cert", temp.resolve("cert").toAbsolutePath().toString(),
-                             "--data-plane-private-key", temp.resolve("key").toAbsolutePath().toString()),
+        assertEquals(List.of("vespa", "test", systemTests.toAbsolutePath().toString()),
                      builder.command());
+        assertEquals("{\"endpoints\":[{\"cluster\":\"default\",\"url\":\"https://dev.endpoint:443/\"}]}",
+                     builder.environment().get("VESPA_CLI_ENDPOINTS"));
+        assertEquals(temp.resolve("key").toAbsolutePath().toString(),
+                     builder.environment().get("VESPA_CLI_DATA_PLANE_KEY_FILE"));
+        assertEquals(temp.resolve("cert").toAbsolutePath().toString(),
+                     builder.environment().get("VESPA_CLI_DATA_PLANE_CERT_FILE"));
     }
 
 }