From 0ce13a7038f08d07a8edd66074674bd5ac5c2ce4 Mon Sep 17 00:00:00 2001
From: Jon Marius Venstad <jvenstad@yahoo-inc.com>
Date: Tue, 26 Mar 2019 14:28:10 +0100
Subject: Use vespaHome

---
 .../main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java  | 4 +++-
 vespa-testrunner-components/src/test/resources/pom.xml_system_tests   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'vespa-testrunner-components')

diff --git a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java
index 4e89e57f0ca..7a85eabe289 100644
--- a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java
+++ b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java
@@ -1,5 +1,7 @@
 package com.yahoo.vespa.hosted.testrunner;
 
+import com.yahoo.vespa.defaults.Defaults;
+
 import java.nio.file.Path;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -67,7 +69,7 @@ public class PomXmlGenerator {
             "                    <reportsDirectory>${env.TEST_DIR}</reportsDirectory>\n" +
             "                    <redirectTestOutputToFile>false</redirectTestOutputToFile>\n" +
             "                    <environmentVariables>\n" +
-            "                        <LD_LIBRARY_PATH>/home/y/lib64</LD_LIBRARY_PATH>\n" +
+            "                        <LD_LIBRARY_PATH>" + Defaults.getDefaults().underVespaHome("lib64") + "</LD_LIBRARY_PATH>\n" +
             "                    </environmentVariables>\n" +
             "                </configuration>\n" +
             "            </plugin>\n" +
diff --git a/vespa-testrunner-components/src/test/resources/pom.xml_system_tests b/vespa-testrunner-components/src/test/resources/pom.xml_system_tests
index 4f7565e7449..22382b84316 100644
--- a/vespa-testrunner-components/src/test/resources/pom.xml_system_tests
+++ b/vespa-testrunner-components/src/test/resources/pom.xml_system_tests
@@ -55,7 +55,7 @@
                     <reportsDirectory>${env.TEST_DIR}</reportsDirectory>
                     <redirectTestOutputToFile>false</redirectTestOutputToFile>
                     <environmentVariables>
-                        <LD_LIBRARY_PATH>/home/y/lib64</LD_LIBRARY_PATH>
+                        <LD_LIBRARY_PATH>/opt/vespa/lib64</LD_LIBRARY_PATH>
                     </environmentVariables>
                 </configuration>
             </plugin>
-- 
cgit v1.2.3