From 17cc18a0fe6a94f086d2d25d04f7d8a7030c85db Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Fri, 17 Jan 2020 11:44:20 +0100 Subject: Run staging-setup tagged unit tests on initial staging deployment before upgrade --- .../main/java/com/yahoo/vespa/hosted/testrunner/TestProfile.java | 1 + .../main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java | 9 ++------- .../com/yahoo/vespa/hosted/testrunner/TestRunnerHandler.java | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) (limited to 'vespa-testrunner-components/src/main') diff --git a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestProfile.java b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestProfile.java index e49650e35e3..c62511dc258 100644 --- a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestProfile.java +++ b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestProfile.java @@ -8,6 +8,7 @@ package com.yahoo.vespa.hosted.testrunner; enum TestProfile { SYSTEM_TEST("system, com.yahoo.vespa.tenant.systemtest.base.SystemTest", true), + STAGING_SETUP_TEST("staging-setup, com.yahoo.vespa.tenant.systemtest.base.StagingTest", false), STAGING_TEST("staging, com.yahoo.vespa.tenant.systemtest.base.StagingTest", true), PRODUCTION_TEST("production, com.yahoo.vespa.tenant.systemtest.base.ProductionTest", false); 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 9e7b80d2be3..bf95b2ef6c5 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 @@ -134,14 +134,9 @@ public class TestRunner { ProcessBuilder builder = testBuilder.apply(testProfile); { LogRecord record = new LogRecord(Level.INFO, - String.format("Starting %s. Artifacts directory: %s Config file: %s\n" + - "Command to run: %s\n" + - "Environment:\n%s", + String.format("Starting %s. Artifacts directory: %s Config file: %s\nCommand to run: %s\n", testProfile.name(), artifactsPath, configFile, - String.join(" ", builder.command()), - System.getenv().entrySet().stream() - .map(entry -> entry.getKey() + ": " + entry.getValue()) - .collect(Collectors.joining("\n")))); + String.join(" ", builder.command()))); log.put(record.getSequenceNumber(), record); logger.log(record); log.put(record.getSequenceNumber(), record); diff --git a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandler.java b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandler.java index b5366a97e86..275d9f97dcf 100644 --- a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandler.java +++ b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunnerHandler.java @@ -87,7 +87,7 @@ public class TestRunnerHandler extends LoggingRequestHandler { private static String lastElement(String path) { if (path.endsWith("/")) - path = path.substring(0, path.length()-1); + path = path.substring(0, path.length() - 1); int lastSlash = path.lastIndexOf("/"); if (lastSlash < 0) return path; return path.substring(lastSlash + 1, path.length()); -- cgit v1.2.3