diff options
Diffstat (limited to 'vespa-testrunner-components')
| -rw-r--r-- | vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java | 18 |
1 files changed, 15 insertions, 3 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 a14c1e2a231..5ad28730a8b 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 @@ -29,6 +29,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import static com.yahoo.log.LogLevel.ERROR; +import static java.util.logging.Level.INFO; /** * @author valerijf @@ -83,7 +84,10 @@ public class TestRunner { static ProcessBuilder mavenProcessFrom(TestProfile profile, TestRunnerConfig config) { List<String> command = new ArrayList<>(); - command.add("mvn"); + 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("test"); command.add("--batch-mode"); // Run in non-interactive (batch) mode (disables output color) @@ -129,8 +133,16 @@ public class TestRunner { ProcessBuilder builder = testBuilder.apply(testProfile); { LogRecord record = new LogRecord(Level.INFO, - String.format("Starting %s. Artifacts directory: %s Config file: %s\nCommand to run: %s", - testProfile.name(), artifactsPath, configFile, String.join(" ", builder.command()))); + String.format("Starting %s. Artifacts directory: %s Config file: %s\n" + + "Command to run: %s\n" + + "Environment:\n%s", + testProfile.name(), artifactsPath, configFile, + String.join(" ", builder.command()), + System.getenv().entrySet().stream() + .map(entry -> entry.getKey() + ": " + entry.getValue()) + .collect(Collectors.joining("\n")))); + log.put(record.getSequenceNumber(), record); + logger.log(record); log.put(record.getSequenceNumber(), record); logger.log(record); } |