diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-03-15 11:28:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-15 11:28:58 +0100 |
commit | 689c08f90d6f153bac98685825591562f0e8c1e5 (patch) | |
tree | 2fc1468c9ec372ac84d35b4329c3b3e49d64a090 | |
parent | ac8a7e9ca1af7d0db284847d57a200e43e41f5ed (diff) | |
parent | 2c4f2ca7d662fdec5d9f246ee0a025acdf3caf3e (diff) |
Merge pull request #21685 from vespa-engine/mpolden/set-explicit-cache-dir
Set explicit cache directory in Vespa CLI test runner
2 files changed, 10 insertions, 7 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 1ea7266ab12..2dbcef21718 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 @@ -44,7 +44,7 @@ public class VespaCliTestRunner implements TestRunner { private final Path testsPath; private final AtomicReference<Status> status = new AtomicReference<>(Status.NOT_STARTED); - private Path vespaCliHome = null; + private Path vespaCliRoot = null; @Inject public VespaCliTestRunner(VespaCliTestRunnerConfig config) { @@ -100,12 +100,12 @@ public class VespaCliTestRunner implements TestRunner { } } - private Path ensureHomeDirectoryForVespaCli() { - if (vespaCliHome == null) { - vespaCliHome = uncheck(() -> Files.createTempDirectory(VespaCliTestRunner.class.getSimpleName())); - vespaCliHome.toFile().deleteOnExit(); + private Path ensureDirectoryForVespaCli(String dir) { + if (vespaCliRoot == null) { + vespaCliRoot = uncheck(() -> Files.createTempDirectory(VespaCliTestRunner.class.getSimpleName())); + vespaCliRoot.toFile().deleteOnExit(); } - return vespaCliHome; + return uncheck(() -> Files.createDirectories(vespaCliRoot.resolve(dir))); } ProcessBuilder testRunProcessBuilder(Suite suite, TestConfig config) throws IOException { @@ -121,7 +121,8 @@ public class VespaCliTestRunner implements TestRunner { // The CI environment variables tells Vespa CLI to omit certain warnings that do not apply to CI environments builder.environment().put("CI", "true"); builder.environment().put("VESPA_CLI_CLOUD_CI", "true"); - builder.environment().put("VESPA_CLI_HOME", ensureHomeDirectoryForVespaCli().toString()); + builder.environment().put("VESPA_CLI_HOME", ensureDirectoryForVespaCli("cli-home").toString()); + builder.environment().put("VESPA_CLI_CACHE_DIR", ensureDirectoryForVespaCli("cli-cache").toString()); 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()); 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 8b02575b950..357106da646 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 @@ -58,6 +58,8 @@ class VespaCliTestRunnerTest { builder.command()); assertTrue(builder.environment().containsKey("CI")); assertTrue(builder.environment().containsKey("VESPA_CLI_CLOUD_CI")); + assertTrue(builder.environment().containsKey("VESPA_CLI_HOME")); + assertTrue(builder.environment().containsKey("VESPA_CLI_CACHE_DIR")); assertEquals("{\"endpoints\":[{\"cluster\":\"default\",\"url\":\"https://dev.endpoint:443/\"}]}", builder.environment().get("VESPA_CLI_ENDPOINTS")); assertEquals(artifacts.resolve("key").toAbsolutePath().toString(), |