diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2019-09-09 08:42:04 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2019-09-09 11:44:13 +0200 |
commit | 8a64b56b5f0d42231be854debbd9bfd15683ceb1 (patch) | |
tree | 45c7d86b6abfd139cdc95348072da927fe18d3b7 /vespa-testrunner-components/src/main/java/com | |
parent | bfdeaee62971c4978ab18397f82e1fb8ab53c237 (diff) |
Add key and certificate pair to tester artifacts, and use for SSLContext
Diffstat (limited to 'vespa-testrunner-components/src/main/java/com')
-rw-r--r-- | vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java index dc2621b822a..420b37441a5 100644 --- a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java +++ b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java @@ -99,6 +99,8 @@ public class TestRunner { command.add("-Dvespa.test.config=" + vespaHome.resolve("tmp/config.json")); if (config.useAthenzCredentials()) command.add("-Dvespa.test.credentials.root=" + Defaults.getDefaults().vespaHome() + "/var/vespa/sia"); + else if (config.useTesterCertificate()) + command.add("-Dvespa.test.credentials.root=" + config.artifactsPath()); command.add(String.format("-DargLine=-Xms%1$dm -Xmx%1$dm", config.surefireMemoryMb())); ProcessBuilder builder = new ProcessBuilder(command); |