Merge pull request #24611 from vespa-engine/arnej/prefer-underVespaHome

prefer underVespaHome() to construct sub-directories

2 files changed, 2 insertions, 2 deletions

diff --git a/flags/src/main/java/com/yahoo/vespa/flags/file/FlagDbFile.java b/flags/src/main/java/com/yahoo/vespa/flags/file/FlagDbFile.java
index 0b931aa7fa6..4cd33c968b6 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/file/FlagDbFile.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/file/FlagDbFile.java
@@ -42,7 +42,7 @@ public class FlagDbFile {
     }
 
     public FlagDbFile(FileSystem fileSystem) {
-        this(fileSystem.getPath(Defaults.getDefaults().vespaHome() + "/var/vespa/flag.db"));
+        this(fileSystem.getPath(Defaults.getDefaults().underVespaHome("var/vespa/flag.db")));
     }
 
     public FlagDbFile(Path path) {
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 f0ea46e5220..4d50d323222 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
@@ -90,7 +90,7 @@ public class TestRunner implements com.yahoo.vespa.testrunner.TestRunner {
         command.add("-DfailIfNoTests=" + profile.failIfNoTests());
         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");
+            command.add("-Dvespa.test.credentials.root=" + Defaults.getDefaults().underVespaHome("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()));