allow override from env.var

1 files changed, 4 insertions, 1 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/net/HostName.java b/vespajlib/src/main/java/com/yahoo/net/HostName.java
index 4c51a5e1ba1..37f7fe80246 100644
--- a/vespajlib/src/main/java/com/yahoo/net/HostName.java
+++ b/vespajlib/src/main/java/com/yahoo/net/HostName.java
@@ -118,6 +118,10 @@ public class HostName {
      * DO NOT USE: Package-private for testing purposes (all testing machines should have a hostname)
      */
     static String getSystemHostName() throws Exception {
+        String env = System.getenv("VESPA_HOSTNAME");
+        if (env != null && ! env.trim().isEmpty()) {
+            return env.trim();
+        }
         Process process = Runtime.getRuntime().exec("hostname");
         BufferedReader in = new BufferedReader(new InputStreamReader(process.getInputStream()));
         String hostname = in.readLine();
@@ -125,7 +129,6 @@ public class HostName {
         if (process.exitValue() != 0) {
             throw new RuntimeException("Command 'hostname' failed with exit code " + process.exitValue());
         }
-
         return hostname;
     }