summaryrefslogtreecommitdiffstats
path: root/vespa-testrunner-components
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@verizonmedia.com>2019-08-26 09:10:05 +0200
committerHåkon Hallingstad <hakon@verizonmedia.com>2019-08-26 09:10:05 +0200
commit3a5e0d9ddc375c8590505e2b3830358cd84ad607 (patch)
tree96f34dba034f94bc57929c8358bb57ec64d070d4 /vespa-testrunner-components
parentec4240010b82eabc1fa0efad47082541da9d246a (diff)
Locate mvn from PATH
Diffstat (limited to 'vespa-testrunner-components')
-rw-r--r--vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java5
1 files changed, 1 insertions, 4 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 5ad28730a8b..dc2621b822a 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
@@ -84,10 +84,7 @@ public class TestRunner {
static ProcessBuilder mavenProcessFrom(TestProfile profile, TestRunnerConfig config) {
List<String> command = new ArrayList<>();
- if (Path.of("/opt/vespa").equals(Path.of(Defaults.getDefaults().vespaHome())))
- command.add("/opt/vespa/local/maven/bin/mvn");
- else
- command.add("mvn");
+ command.add("mvn"); // mvn must be in PATH of the jDisc containers
command.add("test");
command.add("--batch-mode"); // Run in non-interactive (batch) mode (disables output color)